summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authorwolenetz@chromium.org <wolenetz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-16 06:25:05 +0000
committerwolenetz@chromium.org <wolenetz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-16 06:25:05 +0000
commit57cbebd3efc80ebd8f474514d721f9df79496484 (patch)
tree837c632ca0d4dea415ed8ad69f450328ffb85e21 /DEPS
parent2c8a0aa7ec6ea9bf947e32089a3308ddbbb9a10f (diff)
downloadchromium_src-57cbebd3efc80ebd8f474514d721f9df79496484.zip
chromium_src-57cbebd3efc80ebd8f474514d721f9df79496484.tar.gz
chromium_src-57cbebd3efc80ebd8f474514d721f9df79496484.tar.bz2
Roll FFmpeg for M29
Chrome-side changes: 1. Use AVCodecID instead of CodecID. 2. Accomodate FFmpeg's new internal refcounted buffers: * Use av_free_packet() instead of av_destruct_packet() in FFmpegH264ToAnnexBBitstreamConverterTests (http://crbug.com/238543) * Add TSAN suppressions (http://crbug.com/239350) * Copy from data[] in FFmpegCdmVideoDecoder. (http://crbug.com/240573) 3. Update ffmpeg_regression_tests: * Rebaseline expectations (http://crbug.com/237363) * Mark some flaky (http://crbug.com/237371) * Change disabled to flaky (http://crbug.com/236979) * Add new tests. (http://crbug.com/234630) R=dalecurtis BUG=238543,239350,237363,237371,236979,234630,123426,223295,236611,234630,240573,241212 Review URL: https://chromiumcodereview.appspot.com/15078005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200467 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'DEPS')
-rw-r--r--DEPS4
1 files changed, 2 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index a403dc4..1f4e600 100644
--- a/DEPS
+++ b/DEPS
@@ -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": "198257",
- "ffmpeg_hash": "04db474e52bae0eef2cd22341aca1caf427411de",
+ "ffmpeg_revision": "200366",
+ "ffmpeg_hash": "c5c56fa61a9bf2916cbd734c201e099a6500845f",
"sfntly_revision": "134",
"skia_revision": "9130",