| Index: media/ffmpeg/ffmpeg_common.cc
|
| diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc
|
| index cb806c74812aba84ee66885a36f746f161ad0129..6b77416fe0a91b3ba64e496dbd72b77c3538ec06 100644
|
| --- a/media/ffmpeg/ffmpeg_common.cc
|
| +++ b/media/ffmpeg/ffmpeg_common.cc
|
| @@ -407,8 +407,17 @@ void AVStreamToVideoDecoderConfig(
|
| }
|
|
|
| VideoFrame::Format format = PixelFormatToVideoFormat(stream->codec->pix_fmt);
|
| + // The format and coded size may be unknown if FFmpeg is compiled without
|
| + // video decoders.
|
| +#if defined(DISABLE_FFMPEG_VIDEO_DECODERS)
|
| + if (format == VideoFrame::UNKNOWN)
|
| + format = VideoFrame::YV12;
|
| + if (coded_size == gfx::Size(0, 0))
|
| + coded_size = visible_rect.size();
|
| +#endif
|
| +
|
| + // TODO(tomfinegan): libavcodec doesn't know about VP9.
|
| if (codec == kCodecVP9) {
|
| - // TODO(tomfinegan): libavcodec doesn't know about VP9.
|
| format = VideoFrame::YV12;
|
| coded_size = visible_rect.size();
|
| }
|
|
|