diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rwxr-xr-x | third_party/ffmpeg/ffmpeg.gyp | 4 |
2 files changed, 1 insertions, 5 deletions
@@ -2,7 +2,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", "webkit_revision": "55373", - "ffmpeg_revision": "40279", + "ffmpeg_revision": "40314", "skia_revision": "504", "chromium_git": "http://src.chromium.org/git", "swig_revision": "37274", diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp index b70ae7b..2cb1655 100755 --- a/third_party/ffmpeg/ffmpeg.gyp +++ b/third_party/ffmpeg/ffmpeg.gyp @@ -91,9 +91,6 @@ 'source/patched-ffmpeg-mt/libavcodec/eval.c', 'source/patched-ffmpeg-mt/libavcodec/faanidct.c', 'source/patched-ffmpeg-mt/libavcodec/fft.c', - 'source/patched-ffmpeg-mt/libavcodec/flac.c', # TODO(fbarchard): Review for stripping. - 'source/patched-ffmpeg-mt/libavcodec/flacdata.c', # TODO(fbarchard): Review for stripping. - 'source/patched-ffmpeg-mt/libavcodec/flacdec.c', # TODO(fbarchard): Review for stripping. 'source/patched-ffmpeg-mt/libavcodec/golomb.c', # TODO(fbarchard): Move to Chrome 'source/patched-ffmpeg-mt/libavcodec/imgconvert.c', 'source/patched-ffmpeg-mt/libavcodec/jrevdct.c', @@ -121,7 +118,6 @@ 'source/patched-ffmpeg-mt/libavformat/metadata_compat.c', 'source/patched-ffmpeg-mt/libavformat/oggdec.c', 'source/patched-ffmpeg-mt/libavformat/oggparsedirac.c', # TODO(fbarchard): Review this file. - 'source/patched-ffmpeg-mt/libavformat/oggparseflac.c', # TODO(fbarchard): Review this file. 'source/patched-ffmpeg-mt/libavformat/oggparseogm.c', 'source/patched-ffmpeg-mt/libavformat/oggparsespeex.c', # TODO(fbarchard): Review this file. 'source/patched-ffmpeg-mt/libavformat/oggparsetheora.c', |