Chromium side changes for enabling VP8 and WebM support.

Patches by Frank Galligan (fgalligan@google.com), Tom Finegan (tomfinegan@google.com) and James Zern (jzern@google.com).

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/2093007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47759 0039d316-1c4b-4281-b951-d872f2087c98

17 files changed, 93 insertions, 3 deletions

diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp
index 9833911..bfe0b6f 100644
--- a/third_party/ffmpeg/ffmpeg.gyp
+++ b/third_party/ffmpeg/ffmpeg.gyp
@@ -56,6 +56,16 @@
       ['target_arch=="arm"', {
         'ffmpeg_asm_lib': 0,
       }],
+
+      # libvpx location.
+      # TODO(scherkus): libvpx_hack_dir is a hack to make -L work on linux.
+      ['OS=="mac" or OS=="win"', {
+        'libvpx_dir': '../libvpx',
+        'libvpx_hack_dir': '../libvpx',
+      }, {
+        'libvpx_dir': '../libvpx',
+        'libvpx_hack_dir': 'third_party/libvpx',
+      }],
     ],
     'ffmpeg_variant%': '<(target_arch)',
 
@@ -86,6 +96,7 @@
             'source/patched-ffmpeg-mt/libavcodec/golomb.c',
             'source/patched-ffmpeg-mt/libavcodec/imgconvert.c',
             'source/patched-ffmpeg-mt/libavcodec/jrevdct.c',
+            'source/patched-ffmpeg-mt/libavcodec/libvpxdec.c',
             'source/patched-ffmpeg-mt/libavcodec/mdct.c',
             'source/patched-ffmpeg-mt/libavcodec/mpeg12data.c',
             'source/patched-ffmpeg-mt/libavcodec/mpeg4audio.c',
@@ -109,6 +120,8 @@
             'source/patched-ffmpeg-mt/libavformat/cutils.c',
             'source/patched-ffmpeg-mt/libavformat/id3v1.c',
             'source/patched-ffmpeg-mt/libavformat/isom.c',
+            'source/patched-ffmpeg-mt/libavformat/matroska.c',
+            'source/patched-ffmpeg-mt/libavformat/matroskadec.c',
             'source/patched-ffmpeg-mt/libavformat/metadata.c',
             'source/patched-ffmpeg-mt/libavformat/metadata_compat.c',
             'source/patched-ffmpeg-mt/libavformat/oggdec.c',
@@ -117,12 +130,16 @@
             'source/patched-ffmpeg-mt/libavformat/oggparsevorbis.c',
             'source/patched-ffmpeg-mt/libavformat/options.c',
             'source/patched-ffmpeg-mt/libavformat/riff.c',
+            'source/patched-ffmpeg-mt/libavformat/rm.c',
+            'source/patched-ffmpeg-mt/libavformat/rmdec.c',
             'source/patched-ffmpeg-mt/libavformat/utils.c',
             'source/patched-ffmpeg-mt/libavformat/vorbiscomment.c',
             'source/patched-ffmpeg-mt/libavutil/avstring.c',
+            'source/patched-ffmpeg-mt/libavutil/base64.c',
             'source/patched-ffmpeg-mt/libavutil/crc.c',
             'source/patched-ffmpeg-mt/libavutil/intfloat_readwrite.c',
             'source/patched-ffmpeg-mt/libavutil/log.c',
+            'source/patched-ffmpeg-mt/libavutil/lzo.c',
             'source/patched-ffmpeg-mt/libavutil/mathematics.c',
             'source/patched-ffmpeg-mt/libavutil/mem.c',
             'source/patched-ffmpeg-mt/libavutil/pixdesc.c',
@@ -135,6 +152,7 @@
             'source/config/<(ffmpeg_branding)/<(OS)/<(ffmpeg_config)',
             'source/patched-ffmpeg-mt',
             'source/config',
+            '<(libvpx_dir)/include',
           ],
           'defines': [
             'HAVE_AV_CONFIG_H',
@@ -364,9 +382,11 @@
                 'ldflags': [
                   '-Wl,-Bsymbolic',
                   '-L<(shared_generated_dir)',
+                  '-L<(libvpx_hack_dir)/lib/<(OS)/<(target_arch)',
                 ],
                 'libraries': [
                   '-lz',
+                  '-lvpx',
                 ],
                 'conditions': [
                   ['ffmpeg_asm_lib==1', {
@@ -386,6 +406,7 @@
                 #
                 # http://code.google.com/p/gyp/issues/detail?id=108
                 '<(shared_generated_dir)/<(STATIC_LIB_PREFIX)<(asm_library)<(STATIC_LIB_SUFFIX)',
+                '<(libvpx_hack_dir)/lib/<(OS)/<(target_arch)/libvpx.a',
               ],
               'link_settings': {
                 'libraries': [
@@ -413,7 +434,8 @@
                   # butterflies still exist...as do rainbows, sunshine,
                   # tulips, etc., etc...but not kittens. Those went away
                   # with this flag.
-                  '-Wl,-read_only_relocs,suppress'
+                  '-Wl,-read_only_relocs,suppress',
+                  '-L<(libvpx_hack_dir)/lib/mac/ia32'
                 ],
               },
             }],  # OS=="mac"
diff --git a/third_party/ffmpeg/source/config/Chrome/linux/ia32/config.h b/third_party/ffmpeg/source/config/Chrome/linux/ia32/config.h
index c6ccb6a..e3e2564 100644
--- a/third_party/ffmpeg/source/config/Chrome/linux/ia32/config.h
+++ b/third_party/ffmpeg/source/config/Chrome/linux/ia32/config.h
@@ -875,4 +875,8 @@
 #define CONFIG_ALSA_OUTDEV 0
 #define CONFIG_AUDIO_BEOS_OUTDEV 0
 #define CONFIG_OSS_OUTDEV 0
+#define CONFIG_LIBVPX_VP8_DECODER 1
+#define CONFIG_LIBVPX_VP8_ENCODER 0
+#define CONFIG_WEBM_DEMUXER 1
+#define CONFIG_WEBM_MUXER 0
 #endif /* FFMPEG_CONFIG_H */
diff --git a/third_party/ffmpeg/source/config/Chrome/linux/x64/config.h b/third_party/ffmpeg/source/config/Chrome/linux/x64/config.h
index 42d07df..a597b4d 100644
--- a/third_party/ffmpeg/source/config/Chrome/linux/x64/config.h
+++ b/third_party/ffmpeg/source/config/Chrome/linux/x64/config.h
@@ -875,4 +875,8 @@
 #define CONFIG_ALSA_OUTDEV 0
 #define CONFIG_AUDIO_BEOS_OUTDEV 0
 #define CONFIG_OSS_OUTDEV 0
+#define CONFIG_LIBVPX_VP8_DECODER 1
+#define CONFIG_LIBVPX_VP8_ENCODER 0
+#define CONFIG_WEBM_DEMUXER 1
+#define CONFIG_WEBM_MUXER 0
 #endif /* FFMPEG_CONFIG_H */
diff --git a/third_party/ffmpeg/source/config/Chrome/mac/ia32/config.h b/third_party/ffmpeg/source/config/Chrome/mac/ia32/config.h
index 9e1f891..d06c203 100644
--- a/third_party/ffmpeg/source/config/Chrome/mac/ia32/config.h
+++ b/third_party/ffmpeg/source/config/Chrome/mac/ia32/config.h
@@ -875,4 +875,9 @@
 #define CONFIG_ALSA_OUTDEV 0
 #define CONFIG_AUDIO_BEOS_OUTDEV 0
 #define CONFIG_OSS_OUTDEV 0
+#define CONFIG_LIBVPX_VP8_DECODER 1
+#define CONFIG_LIBVPX_VP8_ENCODER 0
+#define CONFIG_WEBM_DEMUXER 1
+#define CONFIG_WEBM_MUXER 0
+
 #endif /* FFMPEG_CONFIG_H */
diff --git a/third_party/ffmpeg/source/config/Chrome/win/ia32/config.h b/third_party/ffmpeg/source/config/Chrome/win/ia32/config.h
index e108ac2..45d650c 100644
--- a/third_party/ffmpeg/source/config/Chrome/win/ia32/config.h
+++ b/third_party/ffmpeg/source/config/Chrome/win/ia32/config.h
@@ -1,7 +1,7 @@
 /* Automatically generated by configure - do not modify! */
 #ifndef FFMPEG_CONFIG_H
 #define FFMPEG_CONFIG_H
-#define FFMPEG_CONFIGURATION "--disable-ffmpeg --disable-ffplay --disable-ffserver --disable-ffprobe --enable-shared --disable-static --disable-debug --disable-network --disable-encoders --disable-decoders --disable-hwaccels --disable-muxers --disable-demuxers --disable-parsers --disable-bsfs --disable-protocols --disable-devices --disable-filters --disable-gpl --disable-bzlib --disable-zlib --enable-decoder=theora --enable-decoder=vorbis --enable-demuxer=ogg --enable-decoder=aac --enable-decoder=h264 --enable-decoder=mp3 --enable-demuxer=mp3 --enable-demuxer=mov --enable-parser=mpegaudio --enable-pthreads --enable-yasm --enable-memalign-hack --cc=gcc-sjlj --prefix=./chrome-ffmpeg"
+#define FFMPEG_CONFIGURATION "--disable-ffmpeg --disable-ffplay --disable-ffserver --disable-ffprobe --enable-shared --disable-static --disable-debug --disable-network --disable-encoders --disable-decoders --disable-hwaccels --disable-muxers --disable-demuxers --disable-parsers --disable-bsfs --disable-protocols --disable-devices --disable-filters --disable-gpl --disable-bzlib --disable-zlib --enable-decoder=theora --enable-decoder=vorbis --enable-demuxer=ogg --enable-decoder=aac --enable-decoder=h264 --enable-decoder=mp3 --enable-demuxer=mp3 --enable-demuxer=mov --enable-parser=mpegaudio --enable-decoder=libvpx_vp8 --enable-demuxer=webm --extra-cflags='-O2 -I/d/src/vp8/decode/include -fno-strict-aliasing' --extra-ldflags=-L/d/src/vp8/decode/lib --extra-libs=-lvpx --enable-pthreads --enable-yasm --enable-memalign-hack --cc=gcc-sjlj --prefix=./chrome-ffmpeg"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define FFMPEG_DATADIR "./chrome-ffmpeg/share/ffmpeg"
 #define CC_TYPE "gcc"
@@ -475,6 +475,7 @@
 #define CONFIG_LIBOPENJPEG_DECODER 0
 #define CONFIG_LIBSCHROEDINGER_DECODER 0
 #define CONFIG_LIBSPEEX_DECODER 0
+#define CONFIG_LIBVPX_VP8_DECODER 1
 #define CONFIG_ASV1_ENCODER 0
 #define CONFIG_ASV2_ENCODER 0
 #define CONFIG_BMP_ENCODER 0
@@ -573,6 +574,7 @@
 #define CONFIG_LIBSCHROEDINGER_ENCODER 0
 #define CONFIG_LIBTHEORA_ENCODER 0
 #define CONFIG_LIBVORBIS_ENCODER 0
+#define CONFIG_LIBVPX_VP8_ENCODER 0
 #define CONFIG_LIBX264_ENCODER 0
 #define CONFIG_LIBXVID_ENCODER 0
 #define CONFIG_H263_VAAPI_HWACCEL 0
@@ -744,6 +746,7 @@
 #define CONFIG_W64_DEMUXER 0
 #define CONFIG_WAV_DEMUXER 0
 #define CONFIG_WC3_DEMUXER 0
+#define CONFIG_WEBM_DEMUXER 1
 #define CONFIG_WSAUD_DEMUXER 0
 #define CONFIG_WSVQA_DEMUXER 0
 #define CONFIG_WV_DEMUXER 0
@@ -839,6 +842,7 @@
 #define CONFIG_VC1T_MUXER 0
 #define CONFIG_VOC_MUXER 0
 #define CONFIG_WAV_MUXER 0
+#define CONFIG_WEBM_MUXER 0
 #define CONFIG_YUV4MPEGPIPE_MUXER 0
 #define CONFIG_LIBNUT_MUXER 0
 #define CONFIG_ASPECT_FILTER 0
diff --git a/third_party/ffmpeg/source/config/ChromeOS/linux/arm-neon/config.h b/third_party/ffmpeg/source/config/ChromeOS/linux/arm-neon/config.h
index 4fcb2fd..021530a 100644
--- a/third_party/ffmpeg/source/config/ChromeOS/linux/arm-neon/config.h
+++ b/third_party/ffmpeg/source/config/ChromeOS/linux/arm-neon/config.h
@@ -875,4 +875,8 @@
 #define CONFIG_ALSA_OUTDEV 0
 #define CONFIG_AUDIO_BEOS_OUTDEV 0
 #define CONFIG_OSS_OUTDEV 0
+#define CONFIG_LIBVPX_VP8_DECODER 0
+#define CONFIG_LIBVPX_VP8_ENCODER 0
+#define CONFIG_WEBM_DEMUXER 0
+#define CONFIG_WEBM_MUXER 0
 #endif /* FFMPEG_CONFIG_H */
diff --git a/third_party/ffmpeg/source/config/ChromeOS/linux/arm/config.h b/third_party/ffmpeg/source/config/ChromeOS/linux/arm/config.h
index a140dd4..2f2cbe6 100644
--- a/third_party/ffmpeg/source/config/ChromeOS/linux/arm/config.h
+++ b/third_party/ffmpeg/source/config/ChromeOS/linux/arm/config.h
@@ -875,4 +875,8 @@
 #define CONFIG_ALSA_OUTDEV 0
 #define CONFIG_AUDIO_BEOS_OUTDEV 0
 #define CONFIG_OSS_OUTDEV 0
+#define CONFIG_LIBVPX_VP8_DECODER 0
+#define CONFIG_LIBVPX_VP8_ENCODER 0
+#define CONFIG_WEBM_DEMUXER 0
+#define CONFIG_WEBM_MUXER 0
 #endif /* FFMPEG_CONFIG_H */
diff --git a/third_party/ffmpeg/source/config/ChromeOS/linux/ia32/config.h b/third_party/ffmpeg/source/config/ChromeOS/linux/ia32/config.h
index 8f83c5b..005b6a4 100644
--- a/third_party/ffmpeg/source/config/ChromeOS/linux/ia32/config.h
+++ b/third_party/ffmpeg/source/config/ChromeOS/linux/ia32/config.h
@@ -875,4 +875,8 @@
 #define CONFIG_ALSA_OUTDEV 0
 #define CONFIG_AUDIO_BEOS_OUTDEV 0
 #define CONFIG_OSS_OUTDEV 0
+#define CONFIG_LIBVPX_VP8_DECODER 1
+#define CONFIG_LIBVPX_VP8_ENCODER 0
+#define CONFIG_WEBM_DEMUXER 1
+#define CONFIG_WEBM_MUXER 0
 #endif /* FFMPEG_CONFIG_H */
diff --git a/third_party/ffmpeg/source/config/ChromeOS/linux/x64/config.h b/third_party/ffmpeg/source/config/ChromeOS/linux/x64/config.h
index 93cbd4d..25b1e96 100644
--- a/third_party/ffmpeg/source/config/ChromeOS/linux/x64/config.h
+++ b/third_party/ffmpeg/source/config/ChromeOS/linux/x64/config.h
@@ -875,4 +875,8 @@
 #define CONFIG_ALSA_OUTDEV 0
 #define CONFIG_AUDIO_BEOS_OUTDEV 0
 #define CONFIG_OSS_OUTDEV 0
+#define CONFIG_LIBVPX_VP8_DECODER 1
+#define CONFIG_LIBVPX_VP8_ENCODER 0
+#define CONFIG_WEBM_DEMUXER 1
+#define CONFIG_WEBM_MUXER 0
 #endif /* FFMPEG_CONFIG_H */
diff --git a/third_party/ffmpeg/source/config/Chromium/linux/ia32/config.h b/third_party/ffmpeg/source/config/Chromium/linux/ia32/config.h
index 04623dc..22cdfdc 100644
--- a/third_party/ffmpeg/source/config/Chromium/linux/ia32/config.h
+++ b/third_party/ffmpeg/source/config/Chromium/linux/ia32/config.h
@@ -875,4 +875,9 @@
 #define CONFIG_ALSA_OUTDEV 0
 #define CONFIG_AUDIO_BEOS_OUTDEV 0
 #define CONFIG_OSS_OUTDEV 0
+#define CONFIG_LIBVPX_VP8_DECODER 1
+#define CONFIG_LIBVPX_VP8_ENCODER 0
+#define CONFIG_WEBM_DEMUXER 1
+#define CONFIG_WEBM_MUXER 0
+#define CONFIG_H264DSP 1
 #endif /* FFMPEG_CONFIG_H */
diff --git a/third_party/ffmpeg/source/config/Chromium/linux/x64/config.h b/third_party/ffmpeg/source/config/Chromium/linux/x64/config.h
index 97446ce..f0b3117 100644
--- a/third_party/ffmpeg/source/config/Chromium/linux/x64/config.h
+++ b/third_party/ffmpeg/source/config/Chromium/linux/x64/config.h
@@ -875,4 +875,9 @@
 #define CONFIG_ALSA_OUTDEV 0
 #define CONFIG_AUDIO_BEOS_OUTDEV 0
 #define CONFIG_OSS_OUTDEV 0
+#define CONFIG_LIBVPX_VP8_DECODER 1
+#define CONFIG_LIBVPX_VP8_ENCODER 0
+#define CONFIG_WEBM_DEMUXER 1
+#define CONFIG_WEBM_MUXER 0
+#define CONFIG_H264DSP 1
 #endif /* FFMPEG_CONFIG_H */
diff --git a/third_party/ffmpeg/source/config/Chromium/mac/ia32/config.h b/third_party/ffmpeg/source/config/Chromium/mac/ia32/config.h
index 9872409..7022a88 100644
--- a/third_party/ffmpeg/source/config/Chromium/mac/ia32/config.h
+++ b/third_party/ffmpeg/source/config/Chromium/mac/ia32/config.h
@@ -875,4 +875,9 @@
 #define CONFIG_ALSA_OUTDEV 0
 #define CONFIG_AUDIO_BEOS_OUTDEV 0
 #define CONFIG_OSS_OUTDEV 0
+#define CONFIG_LIBVPX_VP8_DECODER 1
+#define CONFIG_LIBVPX_VP8_ENCODER 0
+#define CONFIG_WEBM_DEMUXER 1
+#define CONFIG_WEBM_MUXER 0
+
 #endif /* FFMPEG_CONFIG_H */
diff --git a/third_party/ffmpeg/source/config/Chromium/win/ia32/config.h b/third_party/ffmpeg/source/config/Chromium/win/ia32/config.h
index 031c91b..7d9446a0 100644
--- a/third_party/ffmpeg/source/config/Chromium/win/ia32/config.h
+++ b/third_party/ffmpeg/source/config/Chromium/win/ia32/config.h
@@ -1,7 +1,7 @@
 /* Automatically generated by configure - do not modify! */
 #ifndef FFMPEG_CONFIG_H
 #define FFMPEG_CONFIG_H
-#define FFMPEG_CONFIGURATION "--disable-ffmpeg --disable-ffplay --disable-ffserver --disable-ffprobe --enable-shared --disable-static --disable-debug --disable-network --disable-encoders --disable-decoders --disable-hwaccels --disable-muxers --disable-demuxers --disable-parsers --disable-bsfs --disable-protocols --disable-devices --disable-filters --disable-gpl --disable-bzlib --disable-zlib --enable-decoder=theora --enable-decoder=vorbis --enable-demuxer=ogg --enable-pthreads --enable-yasm --enable-memalign-hack --cc=gcc-sjlj --prefix=./chromium-ffmpeg"
+#define FFMPEG_CONFIGURATION "--disable-ffmpeg --disable-ffplay --disable-ffserver --disable-ffprobe --enable-shared --disable-static --disable-debug --disable-network --disable-encoders --disable-decoders --disable-hwaccels --disable-muxers --disable-demuxers --disable-parsers --disable-bsfs --disable-protocols --disable-devices --disable-filters --disable-gpl --disable-bzlib --disable-zlib --enable-decoder=theora --enable-decoder=vorbis --enable-demuxer=ogg --enable-decoder=libvpx_vp8 --enable-demuxer=webm --extra-cflags='-O2 -I/d/src/vp8/decode/include -fno-strict-aliasing' --extra-ldflags=-L/d/src/vp8/decode/lib --extra-libs=-lvpx --enable-pthreads --enable-yasm --enable-memalign-hack --cc=gcc-sjlj --prefix=./chromium-ffmpeg"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define FFMPEG_DATADIR "./chromium-ffmpeg/share/ffmpeg"
 #define CC_TYPE "gcc"
@@ -475,6 +475,7 @@
 #define CONFIG_LIBOPENJPEG_DECODER 0
 #define CONFIG_LIBSCHROEDINGER_DECODER 0
 #define CONFIG_LIBSPEEX_DECODER 0
+#define CONFIG_LIBVPX_VP8_DECODER 1
 #define CONFIG_ASV1_ENCODER 0
 #define CONFIG_ASV2_ENCODER 0
 #define CONFIG_BMP_ENCODER 0
@@ -573,6 +574,7 @@
 #define CONFIG_LIBSCHROEDINGER_ENCODER 0
 #define CONFIG_LIBTHEORA_ENCODER 0
 #define CONFIG_LIBVORBIS_ENCODER 0
+#define CONFIG_LIBVPX_VP8_ENCODER 0
 #define CONFIG_LIBX264_ENCODER 0
 #define CONFIG_LIBXVID_ENCODER 0
 #define CONFIG_H263_VAAPI_HWACCEL 0
@@ -744,6 +746,7 @@
 #define CONFIG_W64_DEMUXER 0
 #define CONFIG_WAV_DEMUXER 0
 #define CONFIG_WC3_DEMUXER 0
+#define CONFIG_WEBM_DEMUXER 1
 #define CONFIG_WSAUD_DEMUXER 0
 #define CONFIG_WSVQA_DEMUXER 0
 #define CONFIG_WV_DEMUXER 0
@@ -839,6 +842,7 @@
 #define CONFIG_VC1T_MUXER 0
 #define CONFIG_VOC_MUXER 0
 #define CONFIG_WAV_MUXER 0
+#define CONFIG_WEBM_MUXER 0
 #define CONFIG_YUV4MPEGPIPE_MUXER 0
 #define CONFIG_LIBNUT_MUXER 0
 #define CONFIG_ASPECT_FILTER 0
diff --git a/third_party/ffmpeg/source/config/ChromiumOS/linux/arm-neon/config.h b/third_party/ffmpeg/source/config/ChromiumOS/linux/arm-neon/config.h
index 4b8a597..f073571 100644
--- a/third_party/ffmpeg/source/config/ChromiumOS/linux/arm-neon/config.h
+++ b/third_party/ffmpeg/source/config/ChromiumOS/linux/arm-neon/config.h
@@ -875,4 +875,8 @@
 #define CONFIG_ALSA_OUTDEV 0
 #define CONFIG_AUDIO_BEOS_OUTDEV 0
 #define CONFIG_OSS_OUTDEV 0
+#define CONFIG_LIBVPX_VP8_DECODER 0
+#define CONFIG_LIBVPX_VP8_ENCODER 0
+#define CONFIG_WEBM_DEMUXER 0
+#define CONFIG_WEBM_MUXER 0
 #endif /* FFMPEG_CONFIG_H */
diff --git a/third_party/ffmpeg/source/config/ChromiumOS/linux/arm/config.h b/third_party/ffmpeg/source/config/ChromiumOS/linux/arm/config.h
index 5836710..5c2f64a 100644
--- a/third_party/ffmpeg/source/config/ChromiumOS/linux/arm/config.h
+++ b/third_party/ffmpeg/source/config/ChromiumOS/linux/arm/config.h
@@ -875,4 +875,8 @@
 #define CONFIG_ALSA_OUTDEV 0
 #define CONFIG_AUDIO_BEOS_OUTDEV 0
 #define CONFIG_OSS_OUTDEV 0
+#define CONFIG_LIBVPX_VP8_DECODER 0
+#define CONFIG_LIBVPX_VP8_ENCODER 0
+#define CONFIG_WEBM_DEMUXER 0
+#define CONFIG_WEBM_MUXER 0
 #endif /* FFMPEG_CONFIG_H */
diff --git a/third_party/ffmpeg/source/config/ChromiumOS/linux/ia32/config.h b/third_party/ffmpeg/source/config/ChromiumOS/linux/ia32/config.h
index 4b2b309..2815a02 100644
--- a/third_party/ffmpeg/source/config/ChromiumOS/linux/ia32/config.h
+++ b/third_party/ffmpeg/source/config/ChromiumOS/linux/ia32/config.h
@@ -875,4 +875,8 @@
 #define CONFIG_ALSA_OUTDEV 0
 #define CONFIG_AUDIO_BEOS_OUTDEV 0
 #define CONFIG_OSS_OUTDEV 0
+#define CONFIG_LIBVPX_VP8_DECODER 1
+#define CONFIG_LIBVPX_VP8_ENCODER 0
+#define CONFIG_WEBM_DEMUXER 1
+#define CONFIG_WEBM_MUXER 0
 #endif /* FFMPEG_CONFIG_H */
diff --git a/third_party/ffmpeg/source/config/ChromiumOS/linux/x64/config.h b/third_party/ffmpeg/source/config/ChromiumOS/linux/x64/config.h
index bbad8a9..c681085 100644
--- a/third_party/ffmpeg/source/config/ChromiumOS/linux/x64/config.h
+++ b/third_party/ffmpeg/source/config/ChromiumOS/linux/x64/config.h
@@ -875,4 +875,8 @@
 #define CONFIG_ALSA_OUTDEV 0
 #define CONFIG_AUDIO_BEOS_OUTDEV 0
 #define CONFIG_OSS_OUTDEV 0
+#define CONFIG_LIBVPX_VP8_DECODER 1
+#define CONFIG_LIBVPX_VP8_ENCODER 0
+#define CONFIG_WEBM_DEMUXER 1
+#define CONFIG_WEBM_MUXER 0
 #endif /* FFMPEG_CONFIG_H */