diff options
| -rw-r--r-- | media/ffmpeg/ffmpeg_common.cc | 4 | ||||
| -rw-r--r-- | media/video/ffmpeg_video_decode_engine.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc index 65ab9bb..d03715e 100644 --- a/media/ffmpeg/ffmpeg_common.cc +++ b/media/ffmpeg/ffmpeg_common.cc @@ -188,7 +188,7 @@ bool GetStreamByteCountOverRange(AVStream* stream, } int GetSurfaceHeight(AVStream* stream) { - return stream->codec->height; + return stream->codec->coded_height; } int GetSurfaceWidth(AVStream* stream) { @@ -201,7 +201,7 @@ int GetSurfaceWidth(AVStream* stream) { else aspect_ratio = 1.0; - int width = floor(stream->codec->width * aspect_ratio + 0.5); + int width = floor(stream->codec->coded_width * aspect_ratio + 0.5); // An even width makes things easier for YV12 and appears to be the behavior // expected by WebKit layout tests. diff --git a/media/video/ffmpeg_video_decode_engine.cc b/media/video/ffmpeg_video_decode_engine.cc index ced1b60..0958516 100644 --- a/media/video/ffmpeg_video_decode_engine.cc +++ b/media/video/ffmpeg_video_decode_engine.cc @@ -114,8 +114,8 @@ void FFmpegVideoDecodeEngine::Initialize( for (size_t i = 0; i < Limits::kMaxVideoFrames; ++i) { scoped_refptr<VideoFrame> video_frame = VideoFrame::CreateFrame(VideoFrame::YV12, - config.surface_width(), - config.surface_height(), + config.width(), + config.height(), kNoTimestamp, kNoTimestamp); frame_queue_available_.push_back(video_frame); |