Chromium Code Reviews| Index: media/filters/decrypting_demuxer_stream.cc |
| diff --git a/media/filters/decrypting_demuxer_stream.cc b/media/filters/decrypting_demuxer_stream.cc |
| index b069567a0645966539c59511a34a28401c32294c..cd786d56bfce7fb3dcaab15cc7bfe95c64617623 100644 |
| --- a/media/filters/decrypting_demuxer_stream.cc |
| +++ b/media/filters/decrypting_demuxer_stream.cc |
| @@ -161,6 +161,12 @@ void DecryptingDemuxerStream::EnableBitstreamConverter() { |
| demuxer_stream_->EnableBitstreamConverter(); |
| } |
| +bool DecryptingDemuxerStream::SupportsConfigChanges() { |
| + // If we don't have |demuxer_stream_| yet (we haven't been Initialize()-ed), |
| + // be conservative and assume we could have config changes. |
| + return demuxer_stream_ ? demuxer_stream_->SupportsConfigChanges() : true; |
|
scherkus (not reviewing)
2014/03/25 22:16:47
line 161 doesn't make this assumption nor do other
rileya (GONE FROM CHROMIUM)
2014/03/25 22:43:19
Good point, removed that behavior. Looks like the
|
| +} |
| + |
| DecryptingDemuxerStream::~DecryptingDemuxerStream() { |
| DVLOG(2) << __FUNCTION__ << " : state_ = " << state_; |
| } |