summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--third_party/ffmpeg/ffmpeg.gyp1
2 files changed, 2 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index bd45f2d..e8d3b10 100644
--- a/DEPS
+++ b/DEPS
@@ -2,7 +2,7 @@ vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
"webkit_revision": "56197",
- "ffmpeg_revision": "42055",
+ "ffmpeg_revision": "42082",
"skia_revision": "504",
"chromium_git": "http://src.chromium.org/git",
"swig_revision": "40423",
diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp
index 5ad3c83..e16dd90 100644
--- a/third_party/ffmpeg/ffmpeg.gyp
+++ b/third_party/ffmpeg/ffmpeg.gyp
@@ -107,6 +107,7 @@
'source/patched-ffmpeg-mt/libavcodec/vp3dsp.c',
'source/patched-ffmpeg-mt/libavcodec/xiph.c',
'source/patched-ffmpeg-mt/libavformat/allformats.c',
+ 'source/patched-ffmpeg-mt/libavformat/avi.c',
'source/patched-ffmpeg-mt/libavformat/avio.c',
'source/patched-ffmpeg-mt/libavformat/aviobuf.c',
'source/patched-ffmpeg-mt/libavformat/cutils.c',