summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authordalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-24 01:38:22 +0000
committerdalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-24 01:38:22 +0000
commit8bc3853a9212b28a8d856f81dc2dcd2470e7fa2d (patch)
tree2b8dced7de51b4964c655b7bcaaae5866b985700 /media
parent1d56e124d1a94a00f7aa978d08a73aa3e1b45da9 (diff)
downloadchromium_src-8bc3853a9212b28a8d856f81dc2dcd2470e7fa2d.zip
chromium_src-8bc3853a9212b28a8d856f81dc2dcd2470e7fa2d.tar.gz
chromium_src-8bc3853a9212b28a8d856f81dc2dcd2470e7fa2d.tar.bz2
Roll FFmpeg for bug fixes.
Adds a new test case for the bug. BUG=242786 TEST=ffmpeg_regression_tests TBR=acolwell Review URL: https://codereview.chromium.org/15844005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201958 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/ffmpeg/ffmpeg_regression_tests.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/media/ffmpeg/ffmpeg_regression_tests.cc b/media/ffmpeg/ffmpeg_regression_tests.cc
index 0d27ac8..19f00f8 100644
--- a/media/ffmpeg/ffmpeg_regression_tests.cc
+++ b/media/ffmpeg/ffmpeg_regression_tests.cc
@@ -123,7 +123,6 @@ FFMPEG_TEST_CASE(Cr110849, "security/110849.mkv",
FFMPEG_TEST_CASE(Cr112384, "security/112384.webm",
DEMUXER_ERROR_COULD_NOT_PARSE, DEMUXER_ERROR_COULD_NOT_PARSE,
kNullVideoHash, kNullAudioHash);
-
FFMPEG_TEST_CASE(Cr117912, "security/117912.webm", DEMUXER_ERROR_COULD_NOT_OPEN,
DEMUXER_ERROR_COULD_NOT_OPEN, kNullVideoHash, kNullAudioHash);
FFMPEG_TEST_CASE(Cr123481, "security/123481.ogv", PIPELINE_OK,
@@ -150,6 +149,9 @@ FFMPEG_TEST_CASE(Cr234630a, "security/234630a.mov", PIPELINE_OK,
"-15.52,-18.90,-15.33,-16.68,-14.41,-15.89,");
FFMPEG_TEST_CASE(Cr234630b, "security/234630b.mov", PIPELINE_ERROR_DECODE,
PIPELINE_ERROR_DECODE, kNullVideoHash, kNullAudioHash);
+FFMPEG_TEST_CASE(Cr242786, "security/242786.webm", PIPELINE_OK,
+ PIPELINE_OK, kNullVideoHash,
+ "-1.72,-0.83,0.84,1.70,1.23,-0.53,");
// General MP4 test cases.
FFMPEG_TEST_CASE(MP4_0, "security/aac.10419.mp4", DEMUXER_ERROR_COULD_NOT_OPEN,