diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-05-14 12:12:37 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-05-14 12:12:37 +0100 |
| commit | 010d83a9304c5a91596085d917d248abff47903a (patch) | |
| tree | 41ef1a01862f352f9653c7a9cfa817abefe2cce2 /media/ffmpeg | |
| parent | 08c107de54178bb0990a09adec724924e8bc9486 (diff) | |
| download | chromium_org-010d83a9304c5a91596085d917d248abff47903a.tar.gz | |
Merge from Chromium at DEPS revision 269336
This commit was generated by merge_to_master.py.
Change-Id: I8b9c77f10eccd2a8b4c7ce373ffda18568af54ff
Diffstat (limited to 'media/ffmpeg')
| -rw-r--r-- | media/ffmpeg/ffmpeg_regression_tests.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/media/ffmpeg/ffmpeg_regression_tests.cc b/media/ffmpeg/ffmpeg_regression_tests.cc index 0b68fd0896..311a28e103 100644 --- a/media/ffmpeg/ffmpeg_regression_tests.cc +++ b/media/ffmpeg/ffmpeg_regression_tests.cc @@ -323,6 +323,7 @@ FLAKY_FFMPEG_TEST_CASE(BIG_MEM_4, "security/looping4.mov"); FLAKY_FFMPEG_TEST_CASE(Cr99652, "security/99652.webm"); FLAKY_FFMPEG_TEST_CASE(Cr100464, "security/100464.webm"); FLAKY_FFMPEG_TEST_CASE(Cr111342, "security/111342.ogm"); +FLAKY_FFMPEG_TEST_CASE(Cr368980, "security/368980.mp4"); FLAKY_FFMPEG_TEST_CASE(OGV_0, "security/big_dims.ogv"); FLAKY_FFMPEG_TEST_CASE(OGV_3, "security/smclock_1_0.ogv"); FLAKY_FFMPEG_TEST_CASE(OGV_4, "security/smclock.ogv.1.0.ogv"); |