Chromium Code Reviews| Index: media/filters/ffmpeg_demuxer.cc |
| diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc |
| index 699b2f8f928d20d6bef343f7d9be7712f8becded..c960b750c5db4bfd3ab2ab2836a618e8dd7e8de8 100644 |
| --- a/media/filters/ffmpeg_demuxer.cc |
| +++ b/media/filters/ffmpeg_demuxer.cc |
| @@ -662,7 +662,7 @@ void FFmpegDemuxerStream::Read(const ReadCB& read_cb) { |
| void FFmpegDemuxerStream::EnableBitstreamConverter() { |
| DCHECK(task_runner_->BelongsToCurrentThread()); |
| -#if BUILDFLAG(USE_PROPRIETARY_CODECS) |
| +#if BUILDFLAG(USE_PROPRIETARY_CODECS) || defined(OS_ANDROID) |
|
DaleCurtis
2017/04/21 16:43:03
I'm pretty sure this is wrong, why would you need
braveyao
2017/04/21 16:58:53
But I do hit the "NOTREACHED()" check below. A tes
braveyao
2017/04/21 18:09:45
Done.
|
| InitBitstreamConverter(); |
| #else |
| NOTREACHED() << "Proprietary codecs not enabled."; |