Skip to content

Commit

Permalink
Roll FFmpeg for bug fixes.
Browse files Browse the repository at this point in the history
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
  • Loading branch information
dalecurtis@google.com committed May 24, 2013
1 parent 1d56e12 commit 8bc3853
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
4 changes: 2 additions & 2 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ vars = {

# These two FFmpeg variables must be updated together. One is used for SVN
# checkouts and the other for Git checkouts.
"ffmpeg_revision": "200366",
"ffmpeg_hash": "c5c56fa61a9bf2916cbd734c201e099a6500845f",
"ffmpeg_revision": "201877",
"ffmpeg_hash": "077e57825aec6da2fb11d85484ac3132d164aa34",

"sfntly_revision": "134",
"skia_revision": "9257",
Expand Down
4 changes: 3 additions & 1 deletion media/ffmpeg/ffmpeg_regression_tests.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down

0 comments on commit 8bc3853

Please sign in to comment.