summaryrefslogtreecommitdiffstats
path: root/third_party/ffmpeg
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-19 07:21:18 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-19 07:21:18 +0000
commit08977cda717b5dd0cc8f79ef18910902e773abe6 (patch)
tree5e75f5cfa53c472d3475ac6d37296b2f160af089 /third_party/ffmpeg
parent014c0330c5da4e22329973a741ddae1d1cfdb8bc (diff)
downloadchromium_src-08977cda717b5dd0cc8f79ef18910902e773abe6.zip
chromium_src-08977cda717b5dd0cc8f79ef18910902e773abe6.tar.gz
chromium_src-08977cda717b5dd0cc8f79ef18910902e773abe6.tar.bz2
Roll deps to pick up ffmpeg fix from r42082 and fix a missing file in ffmpeg.gyp.
TBR=fbarchard BUG=none TEST=none Review URL: http://codereview.chromium.org/1133006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42084 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/ffmpeg')
-rw-r--r--third_party/ffmpeg/ffmpeg.gyp1
1 files changed, 1 insertions, 0 deletions
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',