diff options
| author | dalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-03 19:50:40 +0000 |
|---|---|---|
| committer | dalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-03 19:50:40 +0000 |
| commit | bc90c24cf0641835700747045a887b071ec9c797 (patch) | |
| tree | 2bfd022c4a1abcb5029eecd113f91e7b88bbd6a7 | |
| parent | ffe42a533122f6e981339e0c26fbc3447b68528b (diff) | |
| download | chromium_src-bc90c24cf0641835700747045a887b071ec9c797.zip chromium_src-bc90c24cf0641835700747045a887b071ec9c797.tar.gz chromium_src-bc90c24cf0641835700747045a887b071ec9c797.tar.bz2 | |
Merge 108338 - Fix crash on unsupported pixel formats.
Replaces the NOTREACHED() calls with DLOG(WARNING), avoids creating
frames when invalid pixel formats are detected, and finally calls
OnInitializeComplete(false) in FFmpegVideoDecodeEngine::Initialize.
BUG=101803
TEST=Ran unittests. Ran test video.
Review URL: http://codereview.chromium.org/8437021
TBR=dalecurtis@chromium.org
Review URL: http://codereview.chromium.org/8436003
git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108526 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | media/video/ffmpeg_video_decode_engine_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/video/ffmpeg_video_decode_engine_unittest.cc b/media/video/ffmpeg_video_decode_engine_unittest.cc index 0dab545..7edeefd 100644 --- a/media/video/ffmpeg_video_decode_engine_unittest.cc +++ b/media/video/ffmpeg_video_decode_engine_unittest.cc @@ -170,7 +170,7 @@ TEST_F(FFmpegVideoDecodeEngineTest, Initialize_UnsupportedPixelFormat) { kFrameRate.num, kFrameRate.den, NULL, 0); EXPECT_CALL(*this, OnInitializeComplete(false)); - test_engine_->Initialize(this, config); + test_engine_->Initialize(MessageLoop::current(), this, NULL, config); } TEST_F(FFmpegVideoDecodeEngineTest, DecodeFrame_Normal) { |