summaryrefslogtreecommitdiffstats
path: root/media/video/ffmpeg_video_decode_engine.cc
diff options
context:
space:
mode:
authorvrk@chromium.org <vrk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-24 06:11:11 +0000
committervrk@chromium.org <vrk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-24 06:11:11 +0000
commit8dd02cb229fc0736e9b354ac1cdfa27c5e77d6fb (patch)
tree9a6d2704abb023429859df32847f1f8ecbc16ef0 /media/video/ffmpeg_video_decode_engine.cc
parentd8ef715b6145fb3bd9cc70fd051c71b84bb7715b (diff)
downloadchromium_src-8dd02cb229fc0736e9b354ac1cdfa27c5e77d6fb.zip
chromium_src-8dd02cb229fc0736e9b354ac1cdfa27c5e77d6fb.tar.gz
chromium_src-8dd02cb229fc0736e9b354ac1cdfa27c5e77d6fb.tar.bz2
Reland r97895: Use surface_width/height instead of coded_width/coded_height for VideoFrame size
The media_unittests needed to be adjusted to reflect the change made in the dimensions used to create VideoFrames in FFmpegVideoDecodeEngine. BUG=91506 TEST=media_unittests Review URL: http://codereview.chromium.org/7714016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98002 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/video/ffmpeg_video_decode_engine.cc')
-rw-r--r--media/video/ffmpeg_video_decode_engine.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/video/ffmpeg_video_decode_engine.cc b/media/video/ffmpeg_video_decode_engine.cc
index 0958516..ced1b60 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.width(),
- config.height(),
+ config.surface_width(),
+ config.surface_height(),
kNoTimestamp,
kNoTimestamp);
frame_queue_available_.push_back(video_frame);