ffmpeg configurations to include bit stream filters.

arm/arm-neon regenerated using ./configure with --enable-neon or --disable-neon.
BUG=35850
TEST=use openmax to playback videos.  (nontrivial)

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

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

21 files changed, 100 insertions, 35 deletions

diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp
index 2797b75..b70ae7b 100755
--- a/third_party/ffmpeg/ffmpeg.gyp
+++ b/third_party/ffmpeg/ffmpeg.gyp
@@ -197,19 +197,31 @@
             }],  # ffmpeg_branding
             ['ffmpeg_branding=="ChromeOS"', {
               'sources': [
+		'source/patched-ffmpeg-mt/libavcodec/aandcttab.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
+		'source/patched-ffmpeg-mt/libavcodec/error_resilience.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
+		'source/patched-ffmpeg-mt/libavcodec/faandct.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
                 'source/patched-ffmpeg-mt/libavcodec/h263.c',
                 'source/patched-ffmpeg-mt/libavcodec/h263_parser.c', # TODO(fbarchard): Review this file.
                 'source/patched-ffmpeg-mt/libavcodec/h263dec.c',
+                'source/patched-ffmpeg-mt/libavcodec/h264_mp4toannexb_bsf.c', # TODO(fbarchard): Review this file.
                 'source/patched-ffmpeg-mt/libavcodec/intrax8.c',
                 'source/patched-ffmpeg-mt/libavcodec/intrax8dsp.c',
                 'source/patched-ffmpeg-mt/libavcodec/ituh263dec.c', # TODO(fbarchard): Review this file.
+		'source/patched-ffmpeg-mt/libavcodec/ituh263enc.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
+		'source/patched-ffmpeg-mt/libavcodec/jfdctint.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
+		'source/patched-ffmpeg-mt/libavcodec/motion_est.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
                 'source/patched-ffmpeg-mt/libavcodec/mpeg4data.h', # TODO(fbarchard): Review this file.
                 'source/patched-ffmpeg-mt/libavcodec/mpeg4video.c', # TODO(fbarchard): Review this file.
                 'source/patched-ffmpeg-mt/libavcodec/mpeg4video.h', # TODO(fbarchard): Review this file.
                 'source/patched-ffmpeg-mt/libavcodec/mpeg4video_parser.c',
-                'source/patched-ffmpeg-mt/libavcodec/mpeg4videodec.c', # TODO(fbarchard): Review this file.
+                'source/patched-ffmpeg-mt/libavcodec/mpeg4video_es_bsf.c', # TODO(fbarchard): Review this file.
+		'source/patched-ffmpeg-mt/libavcodec/mpeg4videoenc.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
+		'source/patched-ffmpeg-mt/libavcodec/mpeg4videodec.c', # TODO(fbarchard): Review this file.
+		'source/patched-ffmpeg-mt/libavcodec/mpegvideo.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
+		'source/patched-ffmpeg-mt/libavcodec/mpegvideo_enc.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
                 'source/patched-ffmpeg-mt/libavcodec/msmpeg4.c',
                 'source/patched-ffmpeg-mt/libavcodec/msmpeg4data.c',
+		'source/patched-ffmpeg-mt/libavcodec/ratecontrol.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
                 'source/patched-ffmpeg-mt/libavcodec/vc1.c',
                 'source/patched-ffmpeg-mt/libavcodec/vc1data.c',
                 'source/patched-ffmpeg-mt/libavcodec/vc1dec.c', # TODO(fbarchard): Review this file.
@@ -327,13 +339,6 @@
                 }],
               ],
             }],
-           ['target_arch=="arm" and ffmpeg_branding=="ChromeOS"', {
-              'sources': [
-                'source/patched-ffmpeg-mt/libavcodec/h264_mp4toannexb_bsf.c',
-# TODO(fbarchard): mpeg4video_es_bsf.c requires a patch
-#                'source/patched-ffmpeg-mt/libavcodec/mpeg4video_es_bsf.c',
-              ],
-            }],  # target_arch=="arm" and ffmpeg_branding=="ChromeOS"
             ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
               'defines': [
                 '_ISOC99_SOURCE',
diff --git a/third_party/ffmpeg/source/config/Chrome/linux/arm-neon/config.h b/third_party/ffmpeg/source/config/Chrome/linux/arm-neon/config.h
index af940f1..cde222c 100644
--- a/third_party/ffmpeg/source/config/Chrome/linux/arm-neon/config.h
+++ b/third_party/ffmpeg/source/config/Chrome/linux/arm-neon/config.h
@@ -588,10 +588,13 @@
 #define CONFIG_AAC_ADTSTOASC_BSF 0
 #define CONFIG_DUMP_EXTRADATA_BSF 0
 #define CONFIG_H264_MP4TOANNEXB_BSF 0
+#define CONFIG_MPEG4VIDEO_ES_BSF 0
 #define CONFIG_IMX_DUMP_HEADER_BSF 0
 #define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
 #define CONFIG_MP3_HEADER_COMPRESS_BSF 0
 #define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0
+#define CONFIG_VC1_ASFTORCV_BSF 0
+#define CONFIG_VC1_ASFTOANNEXG_BSF 0
 #define CONFIG_MOV2TEXTSUB_BSF 0
 #define CONFIG_NOISE_BSF 0
 #define CONFIG_REMOVE_EXTRADATA_BSF 0
diff --git a/third_party/ffmpeg/source/config/Chrome/linux/arm/config.h b/third_party/ffmpeg/source/config/Chrome/linux/arm/config.h
index 3829480..bb174c4 100644
--- a/third_party/ffmpeg/source/config/Chrome/linux/arm/config.h
+++ b/third_party/ffmpeg/source/config/Chrome/linux/arm/config.h
@@ -588,10 +588,13 @@
 #define CONFIG_AAC_ADTSTOASC_BSF 0
 #define CONFIG_DUMP_EXTRADATA_BSF 0
 #define CONFIG_H264_MP4TOANNEXB_BSF 0
+#define CONFIG_MPEG4VIDEO_ES_BSF 0
 #define CONFIG_IMX_DUMP_HEADER_BSF 0
 #define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
 #define CONFIG_MP3_HEADER_COMPRESS_BSF 0
 #define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0
+#define CONFIG_VC1_ASFTORCV_BSF 0
+#define CONFIG_VC1_ASFTOANNEXG_BSF 0
 #define CONFIG_MOV2TEXTSUB_BSF 0
 #define CONFIG_NOISE_BSF 0
 #define CONFIG_REMOVE_EXTRADATA_BSF 0
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 b5e6db8..95eb63e 100644
--- a/third_party/ffmpeg/source/config/Chrome/linux/ia32/config.h
+++ b/third_party/ffmpeg/source/config/Chrome/linux/ia32/config.h
@@ -588,10 +588,13 @@
 #define CONFIG_AAC_ADTSTOASC_BSF 0
 #define CONFIG_DUMP_EXTRADATA_BSF 0
 #define CONFIG_H264_MP4TOANNEXB_BSF 0
+#define CONFIG_MPEG4VIDEO_ES_BSF 0
 #define CONFIG_IMX_DUMP_HEADER_BSF 0
 #define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
 #define CONFIG_MP3_HEADER_COMPRESS_BSF 0
 #define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0
+#define CONFIG_VC1_ASFTORCV_BSF 0
+#define CONFIG_VC1_ASFTOANNEXG_BSF 0
 #define CONFIG_MOV2TEXTSUB_BSF 0
 #define CONFIG_NOISE_BSF 0
 #define CONFIG_REMOVE_EXTRADATA_BSF 0
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 0cd0b2f..375c167 100644
--- a/third_party/ffmpeg/source/config/Chrome/linux/x64/config.h
+++ b/third_party/ffmpeg/source/config/Chrome/linux/x64/config.h
@@ -9,7 +9,7 @@
 #define restrict restrict
 #define ASMALIGN(ZEROBITS) ".align 1 << " #ZEROBITS "\n\t"
 #define EXTERN_PREFIX ""
-#define EXTERN_ASM
+#define EXTERN_ASM 
 #define ARCH_ALPHA 0
 #define ARCH_ARM 0
 #define ARCH_AVR32 0
@@ -69,8 +69,8 @@
 #define HAVE_DLFCN_H 1
 #define HAVE_DLOPEN 1
 #define HAVE_DOS_PATHS 0
-#define HAVE_EBP_AVAILABLE 0
-#define HAVE_EBX_AVAILABLE 0
+#define HAVE_EBP_AVAILABLE 1
+#define HAVE_EBX_AVAILABLE 1
 #define HAVE_EXP2 1
 #define HAVE_EXP2F 1
 #define HAVE_FAST_64BIT 1
@@ -588,10 +588,13 @@
 #define CONFIG_AAC_ADTSTOASC_BSF 0
 #define CONFIG_DUMP_EXTRADATA_BSF 0
 #define CONFIG_H264_MP4TOANNEXB_BSF 0
+#define CONFIG_MPEG4VIDEO_ES_BSF 0
 #define CONFIG_IMX_DUMP_HEADER_BSF 0
 #define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
 #define CONFIG_MP3_HEADER_COMPRESS_BSF 0
 #define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0
+#define CONFIG_VC1_ASFTORCV_BSF 0
+#define CONFIG_VC1_ASFTOANNEXG_BSF 0
 #define CONFIG_MOV2TEXTSUB_BSF 0
 #define CONFIG_NOISE_BSF 0
 #define CONFIG_REMOVE_EXTRADATA_BSF 0
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 dcad8c9..c21832f 100644
--- a/third_party/ffmpeg/source/config/Chrome/mac/ia32/config.h
+++ b/third_party/ffmpeg/source/config/Chrome/mac/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 --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 --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-memalign-hack --enable-pthreads --enable-yasm --arch=i686 --extra-cflags=-m32 --extra-ldflags=-m32 --prefix=./chrome-ffmpeg"
+#define FFMPEG_CONFIGURATION "--disable-ffmpeg --disable-ffplay --disable-ffserver --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 --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 --arch=i686 --extra-cflags=-m32 --extra-ldflags=-m32 --prefix=./chrome-ffmpeg"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define FFMPEG_DATADIR "./chrome-ffmpeg/share/ffmpeg"
 #define CC_TYPE "gcc"
@@ -181,7 +181,7 @@
 #define CONFIG_LIBXVID 0
 #define CONFIG_LPC 0
 #define CONFIG_MDCT 1
-#define CONFIG_MEMALIGN_HACK 1
+#define CONFIG_MEMALIGN_HACK 0
 #define CONFIG_MLIB 0
 #define CONFIG_MPEGAUDIO_HP 1
 #define CONFIG_NETWORK 0
@@ -588,10 +588,13 @@
 #define CONFIG_AAC_ADTSTOASC_BSF 0
 #define CONFIG_DUMP_EXTRADATA_BSF 0
 #define CONFIG_H264_MP4TOANNEXB_BSF 0
+#define CONFIG_MPEG4VIDEO_ES_BSF 0
 #define CONFIG_IMX_DUMP_HEADER_BSF 0
 #define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
 #define CONFIG_MP3_HEADER_COMPRESS_BSF 0
 #define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0
+#define CONFIG_VC1_ASFTORCV_BSF 0
+#define CONFIG_VC1_ASFTOANNEXG_BSF 0
 #define CONFIG_MOV2TEXTSUB_BSF 0
 #define CONFIG_NOISE_BSF 0
 #define CONFIG_REMOVE_EXTRADATA_BSF 0
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 3ef6dd8..f3fff16 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 "--enable-pthreads --disable-ffmpeg --disable-ffplay --disable-ffserver --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 --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-memalign-hack --cc=gcc-sjlj --prefix=./chrome-ffmpeg"
+#define FFMPEG_CONFIGURATION "--enable-pthreads --disable-ffmpeg --disable-ffplay --disable-ffserver --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 --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-memalign-hack --cc=gcc-sjlj --extra-cflags=-O2 --prefix=./chrome-ffmpeg"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define FFMPEG_DATADIR "./chrome-ffmpeg/share/ffmpeg"
 #define CC_TYPE "gcc"
@@ -128,7 +128,7 @@
 #define HAVE_VIRTUALALLOC 1
 #define HAVE_WINSOCK2_H 0
 #define HAVE_XFORM_ASM 0
-#define HAVE_YASM 0
+#define HAVE_YASM 1
 #define CONFIG_BSFS 0
 #define CONFIG_DECODERS 1
 #define CONFIG_DEMUXERS 1
@@ -588,10 +588,13 @@
 #define CONFIG_AAC_ADTSTOASC_BSF 0
 #define CONFIG_DUMP_EXTRADATA_BSF 0
 #define CONFIG_H264_MP4TOANNEXB_BSF 0
+#define CONFIG_MPEG4VIDEO_ES_BSF 0
 #define CONFIG_IMX_DUMP_HEADER_BSF 0
 #define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
 #define CONFIG_MP3_HEADER_COMPRESS_BSF 0
 #define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0
+#define CONFIG_VC1_ASFTORCV_BSF 0
+#define CONFIG_VC1_ASFTOANNEXG_BSF 0
 #define CONFIG_MOV2TEXTSUB_BSF 0
 #define CONFIG_NOISE_BSF 0
 #define CONFIG_REMOVE_EXTRADATA_BSF 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 69ba411..f6bd13d 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
@@ -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 --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 --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-demuxer=avi --enable-demuxer=wav --enable-demuxer=asf --enable-decoder=wmv1 --enable-decoder=wmv2 --enable-decoder=wmv3 --enable-decoder=wmav1 --enable-decoder=wmav2 --enable-decoder=mpeg4 --enable-decoder=pcm_u8 --enable-decoder=pcm_s16le --enable-bsf=h264_mp4toannexb --enable-pthreads --enable-cross-compile --arch=arm --enable-armv6 --enable-armv6t2 --enable-armvfp --enable-neon --cross-prefix=/usr/local/google/cross-tools/arm-2009q3/bin/arm-none-linux-gnueabi- --extra-cflags='-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp' --prefix=./chrome-ffmpeg"
+#define FFMPEG_CONFIGURATION "--disable-ffmpeg --disable-ffplay --disable-ffserver --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 --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-demuxer=avi --enable-demuxer=wav --enable-demuxer=asf --enable-decoder=wmv1 --enable-decoder=wmv2 --enable-decoder=wmv3 --enable-decoder=wmav1 --enable-decoder=wmav2 --enable-decoder=mpeg4 --enable-decoder=pcm_u8 --enable-decoder=pcm_s16le --enable-bsf=h264_mp4toannexb --enable-bsf=mpeg4video_es --enable-bsf=vc1_asftorcv --enable-bsf=vc1_asftoannexg --enable-pthreads --enable-cross-compile --arch=arm --enable-armv6 --enable-armv6t2 --enable-armvfp --enable-neon --cross-prefix=/usr/local/google/cross-tools/arm-2009q3/bin/arm-none-linux-gnueabi- --extra-cflags='-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp' --prefix=./chrome-ffmpeg"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define FFMPEG_DATADIR "./chrome-ffmpeg/share/ffmpeg"
 #define CC_TYPE "gcc"
@@ -588,10 +588,13 @@
 #define CONFIG_AAC_ADTSTOASC_BSF 0
 #define CONFIG_DUMP_EXTRADATA_BSF 0
 #define CONFIG_H264_MP4TOANNEXB_BSF 1
+#define CONFIG_MPEG4VIDEO_ES_BSF 1
 #define CONFIG_IMX_DUMP_HEADER_BSF 0
 #define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
 #define CONFIG_MP3_HEADER_COMPRESS_BSF 0
 #define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0
+#define CONFIG_VC1_ASFTORCV_BSF 1
+#define CONFIG_VC1_ASFTOANNEXG_BSF 1
 #define CONFIG_MOV2TEXTSUB_BSF 0
 #define CONFIG_NOISE_BSF 0
 #define CONFIG_REMOVE_EXTRADATA_BSF 0
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 cd8e264..34cd707 100644
--- a/third_party/ffmpeg/source/config/ChromeOS/linux/arm/config.h
+++ b/third_party/ffmpeg/source/config/ChromeOS/linux/arm/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 --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 --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-demuxer=avi --enable-demuxer=wav --enable-demuxer=asf --enable-decoder=wmv1 --enable-decoder=wmv2 --enable-decoder=wmv3 --enable-decoder=wmav1 --enable-decoder=wmav2 --enable-decoder=mpeg4 --enable-decoder=pcm_u8 --enable-decoder=pcm_s16le --enable-bsf=h264_mp4toannexb --enable-pthreads --enable-cross-compile --arch=arm --enable-armv6 --enable-armv6t2 --enable-armvfp --disable-neon --cross-prefix=/usr/local/google/cross-tools/arm-2009q3/bin/arm-none-linux-gnueabi- --extra-cflags='-march=armv7-a -mtune=cortex-a8 -mfpu=vfp -mfloat-abi=softfp' --prefix=./chrome-ffmpeg"
+#define FFMPEG_CONFIGURATION "--disable-ffmpeg --disable-ffplay --disable-ffserver --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 --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-demuxer=avi --enable-demuxer=wav --enable-demuxer=asf --enable-decoder=wmv1 --enable-decoder=wmv2 --enable-decoder=wmv3 --enable-decoder=wmav1 --enable-decoder=wmav2 --enable-decoder=mpeg4 --enable-decoder=pcm_u8 --enable-decoder=pcm_s16le --enable-bsf=h264_mp4toannexb --enable-bsf=mpeg4video_es --enable-bsf=vc1_asftorcv --enable-bsf=vc1_asftoannexg --enable-pthreads --enable-cross-compile --arch=arm --enable-armv6 --enable-armv6t2 --enable-armvfp --disable-neon --cross-prefix=/usr/local/google/cross-tools/arm-2009q3/bin/arm-none-linux-gnueabi- --extra-cflags='-march=armv7-a -mtune=cortex-a8 -mfpu=vfp -mfloat-abi=softfp' --prefix=./chrome-ffmpeg"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define FFMPEG_DATADIR "./chrome-ffmpeg/share/ffmpeg"
 #define CC_TYPE "gcc"
@@ -588,10 +588,13 @@
 #define CONFIG_AAC_ADTSTOASC_BSF 0
 #define CONFIG_DUMP_EXTRADATA_BSF 0
 #define CONFIG_H264_MP4TOANNEXB_BSF 1
+#define CONFIG_MPEG4VIDEO_ES_BSF 1
 #define CONFIG_IMX_DUMP_HEADER_BSF 0
 #define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
 #define CONFIG_MP3_HEADER_COMPRESS_BSF 0
 #define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0
+#define CONFIG_VC1_ASFTORCV_BSF 1
+#define CONFIG_VC1_ASFTOANNEXG_BSF 1
 #define CONFIG_MOV2TEXTSUB_BSF 0
 #define CONFIG_NOISE_BSF 0
 #define CONFIG_REMOVE_EXTRADATA_BSF 0
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 79a516e..5bf1c1f 100644
--- a/third_party/ffmpeg/source/config/ChromeOS/linux/ia32/config.h
+++ b/third_party/ffmpeg/source/config/ChromeOS/linux/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 --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 --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-demuxer=avi --enable-demuxer=wav --enable-demuxer=asf --enable-decoder=wmv1 --enable-decoder=wmv2 --enable-decoder=wmv3 --enable-decoder=wmav1 --enable-decoder=wmav2 --enable-decoder=mpeg4 --enable-decoder=pcm_u8 --enable-decoder=pcm_s16le --enable-bsf=h264_mp4toannexb --enable-pthreads --enable-yasm --arch=i686 --extra-cflags=-m32 --extra-ldflags=-m32 --prefix=./chrome-ffmpeg"
+#define FFMPEG_CONFIGURATION "--disable-ffmpeg --disable-ffplay --disable-ffserver --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 --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-demuxer=avi --enable-demuxer=wav --enable-demuxer=asf --enable-decoder=wmv1 --enable-decoder=wmv2 --enable-decoder=wmv3 --enable-decoder=wmav1 --enable-decoder=wmav2 --enable-decoder=mpeg4 --enable-decoder=pcm_u8 --enable-decoder=pcm_s16le --enable-bsf=h264_mp4toannexb --enable-bsf=mpeg4video_es --enable-bsf=vc1_asftorcv --enable-bsf=vc1_asftoannexg --enable-pthreads --enable-yasm --arch=i686 --extra-cflags=-m32 --extra-ldflags=-m32 --prefix=./chrome-ffmpeg"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define FFMPEG_DATADIR "./chrome-ffmpeg/share/ffmpeg"
 #define CC_TYPE "gcc"
@@ -9,7 +9,7 @@
 #define restrict restrict
 #define ASMALIGN(ZEROBITS) ".align 1 << " #ZEROBITS "\n\t"
 #define EXTERN_PREFIX ""
-#define EXTERN_ASM
+#define EXTERN_ASM 
 #define ARCH_ALPHA 0
 #define ARCH_ARM 0
 #define ARCH_AVR32 0
@@ -69,8 +69,8 @@
 #define HAVE_DLFCN_H 1
 #define HAVE_DLOPEN 1
 #define HAVE_DOS_PATHS 0
-#define HAVE_EBP_AVAILABLE 0
-#define HAVE_EBX_AVAILABLE 0
+#define HAVE_EBP_AVAILABLE 1
+#define HAVE_EBX_AVAILABLE 1
 #define HAVE_EXP2 1
 #define HAVE_EXP2F 1
 #define HAVE_FAST_64BIT 0
@@ -588,10 +588,13 @@
 #define CONFIG_AAC_ADTSTOASC_BSF 0
 #define CONFIG_DUMP_EXTRADATA_BSF 0
 #define CONFIG_H264_MP4TOANNEXB_BSF 1
+#define CONFIG_MPEG4VIDEO_ES_BSF 1
 #define CONFIG_IMX_DUMP_HEADER_BSF 0
 #define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
 #define CONFIG_MP3_HEADER_COMPRESS_BSF 0
 #define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0
+#define CONFIG_VC1_ASFTORCV_BSF 1
+#define CONFIG_VC1_ASFTOANNEXG_BSF 1
 #define CONFIG_MOV2TEXTSUB_BSF 0
 #define CONFIG_NOISE_BSF 0
 #define CONFIG_REMOVE_EXTRADATA_BSF 0
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 d7fee10..63997bd 100644
--- a/third_party/ffmpeg/source/config/ChromeOS/linux/x64/config.h
+++ b/third_party/ffmpeg/source/config/ChromeOS/linux/x64/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 --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 --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-demuxer=avi --enable-demuxer=wav --enable-demuxer=asf --enable-decoder=wmv1 --enable-decoder=wmv2 --enable-decoder=wmv3 --enable-decoder=wmav1 --enable-decoder=wmav2 --enable-decoder=mpeg4 --enable-decoder=pcm_u8 --enable-decoder=pcm_s16le --enable-bsf=h264_mp4toannexb --enable-pthreads --enable-yasm --arch=x86_64 --extra-cflags=-m64 --extra-ldflags=-m64 --prefix=./chrome-ffmpeg"
+#define FFMPEG_CONFIGURATION "--disable-ffmpeg --disable-ffplay --disable-ffserver --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 --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-demuxer=avi --enable-demuxer=wav --enable-demuxer=asf --enable-decoder=wmv1 --enable-decoder=wmv2 --enable-decoder=wmv3 --enable-decoder=wmav1 --enable-decoder=wmav2 --enable-decoder=mpeg4 --enable-decoder=pcm_u8 --enable-decoder=pcm_s16le --enable-bsf=h264_mp4toannexb --enable-bsf=mpeg4video_es --enable-bsf=vc1_asftorcv --enable-bsf=vc1_asftoannexg --enable-pthreads --enable-yasm --arch=x86_64 --extra-cflags=-m64 --extra-ldflags=-m64 --prefix=./chrome-ffmpeg"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define FFMPEG_DATADIR "./chrome-ffmpeg/share/ffmpeg"
 #define CC_TYPE "gcc"
@@ -9,7 +9,7 @@
 #define restrict restrict
 #define ASMALIGN(ZEROBITS) ".align 1 << " #ZEROBITS "\n\t"
 #define EXTERN_PREFIX ""
-#define EXTERN_ASM
+#define EXTERN_ASM 
 #define ARCH_ALPHA 0
 #define ARCH_ARM 0
 #define ARCH_AVR32 0
@@ -69,8 +69,8 @@
 #define HAVE_DLFCN_H 1
 #define HAVE_DLOPEN 1
 #define HAVE_DOS_PATHS 0
-#define HAVE_EBP_AVAILABLE 0
-#define HAVE_EBX_AVAILABLE 0
+#define HAVE_EBP_AVAILABLE 1
+#define HAVE_EBX_AVAILABLE 1
 #define HAVE_EXP2 1
 #define HAVE_EXP2F 1
 #define HAVE_FAST_64BIT 1
@@ -588,10 +588,13 @@
 #define CONFIG_AAC_ADTSTOASC_BSF 0
 #define CONFIG_DUMP_EXTRADATA_BSF 0
 #define CONFIG_H264_MP4TOANNEXB_BSF 1
+#define CONFIG_MPEG4VIDEO_ES_BSF 1
 #define CONFIG_IMX_DUMP_HEADER_BSF 0
 #define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
 #define CONFIG_MP3_HEADER_COMPRESS_BSF 0
 #define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0
+#define CONFIG_VC1_ASFTORCV_BSF 1
+#define CONFIG_VC1_ASFTOANNEXG_BSF 1
 #define CONFIG_MOV2TEXTSUB_BSF 0
 #define CONFIG_NOISE_BSF 0
 #define CONFIG_REMOVE_EXTRADATA_BSF 0
diff --git a/third_party/ffmpeg/source/config/Chromium/linux/arm-neon/config.h b/third_party/ffmpeg/source/config/Chromium/linux/arm-neon/config.h
index 77a4445..cae1413 100644
--- a/third_party/ffmpeg/source/config/Chromium/linux/arm-neon/config.h
+++ b/third_party/ffmpeg/source/config/Chromium/linux/arm-neon/config.h
@@ -588,10 +588,13 @@
 #define CONFIG_AAC_ADTSTOASC_BSF 0
 #define CONFIG_DUMP_EXTRADATA_BSF 0
 #define CONFIG_H264_MP4TOANNEXB_BSF 0
+#define CONFIG_MPEG4VIDEO_ES_BSF 0
 #define CONFIG_IMX_DUMP_HEADER_BSF 0
 #define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
 #define CONFIG_MP3_HEADER_COMPRESS_BSF 0
 #define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0
+#define CONFIG_VC1_ASFTORCV_BSF 0
+#define CONFIG_VC1_ASFTOANNEXG_BSF 0
 #define CONFIG_MOV2TEXTSUB_BSF 0
 #define CONFIG_NOISE_BSF 0
 #define CONFIG_REMOVE_EXTRADATA_BSF 0
diff --git a/third_party/ffmpeg/source/config/Chromium/linux/arm/config.h b/third_party/ffmpeg/source/config/Chromium/linux/arm/config.h
index cfda6a4..0923026 100644
--- a/third_party/ffmpeg/source/config/Chromium/linux/arm/config.h
+++ b/third_party/ffmpeg/source/config/Chromium/linux/arm/config.h
@@ -588,10 +588,13 @@
 #define CONFIG_AAC_ADTSTOASC_BSF 0
 #define CONFIG_DUMP_EXTRADATA_BSF 0
 #define CONFIG_H264_MP4TOANNEXB_BSF 0
+#define CONFIG_MPEG4VIDEO_ES_BSF 0
 #define CONFIG_IMX_DUMP_HEADER_BSF 0
 #define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
 #define CONFIG_MP3_HEADER_COMPRESS_BSF 0
 #define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0
+#define CONFIG_VC1_ASFTORCV_BSF 0
+#define CONFIG_VC1_ASFTOANNEXG_BSF 0
 #define CONFIG_MOV2TEXTSUB_BSF 0
 #define CONFIG_NOISE_BSF 0
 #define CONFIG_REMOVE_EXTRADATA_BSF 0
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 7f2e4d897..38c6612 100644
--- a/third_party/ffmpeg/source/config/Chromium/linux/ia32/config.h
+++ b/third_party/ffmpeg/source/config/Chromium/linux/ia32/config.h
@@ -588,10 +588,13 @@
 #define CONFIG_AAC_ADTSTOASC_BSF 0
 #define CONFIG_DUMP_EXTRADATA_BSF 0
 #define CONFIG_H264_MP4TOANNEXB_BSF 0
+#define CONFIG_MPEG4VIDEO_ES_BSF 0
 #define CONFIG_IMX_DUMP_HEADER_BSF 0
 #define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
 #define CONFIG_MP3_HEADER_COMPRESS_BSF 0
 #define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0
+#define CONFIG_VC1_ASFTORCV_BSF 0
+#define CONFIG_VC1_ASFTOANNEXG_BSF 0
 #define CONFIG_MOV2TEXTSUB_BSF 0
 #define CONFIG_NOISE_BSF 0
 #define CONFIG_REMOVE_EXTRADATA_BSF 0
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 93ee51a..c3a5ee0 100644
--- a/third_party/ffmpeg/source/config/Chromium/linux/x64/config.h
+++ b/third_party/ffmpeg/source/config/Chromium/linux/x64/config.h
@@ -9,7 +9,7 @@
 #define restrict restrict
 #define ASMALIGN(ZEROBITS) ".align 1 << " #ZEROBITS "\n\t"
 #define EXTERN_PREFIX ""
-#define EXTERN_ASM
+#define EXTERN_ASM 
 #define ARCH_ALPHA 0
 #define ARCH_ARM 0
 #define ARCH_AVR32 0
@@ -69,8 +69,8 @@
 #define HAVE_DLFCN_H 1
 #define HAVE_DLOPEN 1
 #define HAVE_DOS_PATHS 0
-#define HAVE_EBP_AVAILABLE 0
-#define HAVE_EBX_AVAILABLE 0
+#define HAVE_EBP_AVAILABLE 1
+#define HAVE_EBX_AVAILABLE 1
 #define HAVE_EXP2 1
 #define HAVE_EXP2F 1
 #define HAVE_FAST_64BIT 1
@@ -588,10 +588,13 @@
 #define CONFIG_AAC_ADTSTOASC_BSF 0
 #define CONFIG_DUMP_EXTRADATA_BSF 0
 #define CONFIG_H264_MP4TOANNEXB_BSF 0
+#define CONFIG_MPEG4VIDEO_ES_BSF 0
 #define CONFIG_IMX_DUMP_HEADER_BSF 0
 #define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
 #define CONFIG_MP3_HEADER_COMPRESS_BSF 0
 #define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0
+#define CONFIG_VC1_ASFTORCV_BSF 0
+#define CONFIG_VC1_ASFTOANNEXG_BSF 0
 #define CONFIG_MOV2TEXTSUB_BSF 0
 #define CONFIG_NOISE_BSF 0
 #define CONFIG_REMOVE_EXTRADATA_BSF 0
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 229fa65..52b6b0a 100644
--- a/third_party/ffmpeg/source/config/Chromium/mac/ia32/config.h
+++ b/third_party/ffmpeg/source/config/Chromium/mac/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 --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 --enable-decoder=theora --enable-decoder=vorbis --enable-demuxer=ogg --enable-memalign-hack --enable-pthreads --enable-yasm --arch=i686 --extra-cflags=-m32 --extra-ldflags=-m32 --prefix=./chromium-ffmpeg"
+#define FFMPEG_CONFIGURATION "--disable-ffmpeg --disable-ffplay --disable-ffserver --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 --enable-decoder=theora --enable-decoder=vorbis --enable-demuxer=ogg --enable-pthreads --enable-yasm --arch=i686 --extra-cflags=-m32 --extra-ldflags=-m32 --prefix=./chromium-ffmpeg"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define FFMPEG_DATADIR "./chromium-ffmpeg/share/ffmpeg"
 #define CC_TYPE "gcc"
@@ -181,7 +181,7 @@
 #define CONFIG_LIBXVID 0
 #define CONFIG_LPC 0
 #define CONFIG_MDCT 1
-#define CONFIG_MEMALIGN_HACK 1
+#define CONFIG_MEMALIGN_HACK 0
 #define CONFIG_MLIB 0
 #define CONFIG_MPEGAUDIO_HP 1
 #define CONFIG_NETWORK 0
@@ -588,10 +588,13 @@
 #define CONFIG_AAC_ADTSTOASC_BSF 0
 #define CONFIG_DUMP_EXTRADATA_BSF 0
 #define CONFIG_H264_MP4TOANNEXB_BSF 0
+#define CONFIG_MPEG4VIDEO_ES_BSF 0
 #define CONFIG_IMX_DUMP_HEADER_BSF 0
 #define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
 #define CONFIG_MP3_HEADER_COMPRESS_BSF 0
 #define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0
+#define CONFIG_VC1_ASFTORCV_BSF 0
+#define CONFIG_VC1_ASFTOANNEXG_BSF 0
 #define CONFIG_MOV2TEXTSUB_BSF 0
 #define CONFIG_NOISE_BSF 0
 #define CONFIG_REMOVE_EXTRADATA_BSF 0
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 bd02ea7..2507f33 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 "--enable-pthreads --disable-ffmpeg --disable-ffplay --disable-ffserver --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 --enable-decoder=theora --enable-decoder=vorbis --enable-demuxer=ogg --enable-memalign-hack --cc=gcc-sjlj --prefix=./chromium-ffmpeg"
+#define FFMPEG_CONFIGURATION "--enable-pthreads --disable-ffmpeg --disable-ffplay --disable-ffserver --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 --enable-decoder=theora --enable-decoder=vorbis --enable-demuxer=ogg --enable-memalign-hack --cc=gcc-sjlj --extra-cflags=-O2 --prefix=./chromium-ffmpeg"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define FFMPEG_DATADIR "./chromium-ffmpeg/share/ffmpeg"
 #define CC_TYPE "gcc"
@@ -128,7 +128,7 @@
 #define HAVE_VIRTUALALLOC 1
 #define HAVE_WINSOCK2_H 0
 #define HAVE_XFORM_ASM 0
-#define HAVE_YASM 0
+#define HAVE_YASM 1
 #define CONFIG_BSFS 0
 #define CONFIG_DECODERS 1
 #define CONFIG_DEMUXERS 1
@@ -588,10 +588,13 @@
 #define CONFIG_AAC_ADTSTOASC_BSF 0
 #define CONFIG_DUMP_EXTRADATA_BSF 0
 #define CONFIG_H264_MP4TOANNEXB_BSF 0
+#define CONFIG_MPEG4VIDEO_ES_BSF 0
 #define CONFIG_IMX_DUMP_HEADER_BSF 0
 #define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
 #define CONFIG_MP3_HEADER_COMPRESS_BSF 0
 #define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0
+#define CONFIG_VC1_ASFTORCV_BSF 0
+#define CONFIG_VC1_ASFTOANNEXG_BSF 0
 #define CONFIG_MOV2TEXTSUB_BSF 0
 #define CONFIG_NOISE_BSF 0
 #define CONFIG_REMOVE_EXTRADATA_BSF 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 0335b31..07926dc 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
@@ -588,10 +588,13 @@
 #define CONFIG_AAC_ADTSTOASC_BSF 0
 #define CONFIG_DUMP_EXTRADATA_BSF 0
 #define CONFIG_H264_MP4TOANNEXB_BSF 0
+#define CONFIG_MPEG4VIDEO_ES_BSF 0
 #define CONFIG_IMX_DUMP_HEADER_BSF 0
 #define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
 #define CONFIG_MP3_HEADER_COMPRESS_BSF 0
 #define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0
+#define CONFIG_VC1_ASFTORCV_BSF 0
+#define CONFIG_VC1_ASFTOANNEXG_BSF 0
 #define CONFIG_MOV2TEXTSUB_BSF 0
 #define CONFIG_NOISE_BSF 0
 #define CONFIG_REMOVE_EXTRADATA_BSF 0
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 1fcf3cc..8b0a26f 100644
--- a/third_party/ffmpeg/source/config/ChromiumOS/linux/arm/config.h
+++ b/third_party/ffmpeg/source/config/ChromiumOS/linux/arm/config.h
@@ -588,10 +588,13 @@
 #define CONFIG_AAC_ADTSTOASC_BSF 0
 #define CONFIG_DUMP_EXTRADATA_BSF 0
 #define CONFIG_H264_MP4TOANNEXB_BSF 0
+#define CONFIG_MPEG4VIDEO_ES_BSF 0
 #define CONFIG_IMX_DUMP_HEADER_BSF 0
 #define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
 #define CONFIG_MP3_HEADER_COMPRESS_BSF 0
 #define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0
+#define CONFIG_VC1_ASFTORCV_BSF 0
+#define CONFIG_VC1_ASFTOANNEXG_BSF 0
 #define CONFIG_MOV2TEXTSUB_BSF 0
 #define CONFIG_NOISE_BSF 0
 #define CONFIG_REMOVE_EXTRADATA_BSF 0
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 d597b8d..83b6caa 100644
--- a/third_party/ffmpeg/source/config/ChromiumOS/linux/ia32/config.h
+++ b/third_party/ffmpeg/source/config/ChromiumOS/linux/ia32/config.h
@@ -9,7 +9,7 @@
 #define restrict restrict
 #define ASMALIGN(ZEROBITS) ".align 1 << " #ZEROBITS "\n\t"
 #define EXTERN_PREFIX ""
-#define EXTERN_ASM
+#define EXTERN_ASM 
 #define ARCH_ALPHA 0
 #define ARCH_ARM 0
 #define ARCH_AVR32 0
@@ -69,8 +69,8 @@
 #define HAVE_DLFCN_H 1
 #define HAVE_DLOPEN 1
 #define HAVE_DOS_PATHS 0
-#define HAVE_EBP_AVAILABLE 0
-#define HAVE_EBX_AVAILABLE 0
+#define HAVE_EBP_AVAILABLE 1
+#define HAVE_EBX_AVAILABLE 1
 #define HAVE_EXP2 1
 #define HAVE_EXP2F 1
 #define HAVE_FAST_64BIT 0
@@ -588,10 +588,13 @@
 #define CONFIG_AAC_ADTSTOASC_BSF 0
 #define CONFIG_DUMP_EXTRADATA_BSF 0
 #define CONFIG_H264_MP4TOANNEXB_BSF 0
+#define CONFIG_MPEG4VIDEO_ES_BSF 0
 #define CONFIG_IMX_DUMP_HEADER_BSF 0
 #define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
 #define CONFIG_MP3_HEADER_COMPRESS_BSF 0
 #define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0
+#define CONFIG_VC1_ASFTORCV_BSF 0
+#define CONFIG_VC1_ASFTOANNEXG_BSF 0
 #define CONFIG_MOV2TEXTSUB_BSF 0
 #define CONFIG_NOISE_BSF 0
 #define CONFIG_REMOVE_EXTRADATA_BSF 0
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 cd3bd72..c11ab4f 100644
--- a/third_party/ffmpeg/source/config/ChromiumOS/linux/x64/config.h
+++ b/third_party/ffmpeg/source/config/ChromiumOS/linux/x64/config.h
@@ -588,10 +588,13 @@
 #define CONFIG_AAC_ADTSTOASC_BSF 0
 #define CONFIG_DUMP_EXTRADATA_BSF 0
 #define CONFIG_H264_MP4TOANNEXB_BSF 0
+#define CONFIG_MPEG4VIDEO_ES_BSF 0
 #define CONFIG_IMX_DUMP_HEADER_BSF 0
 #define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
 #define CONFIG_MP3_HEADER_COMPRESS_BSF 0
 #define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0
+#define CONFIG_VC1_ASFTORCV_BSF 0
+#define CONFIG_VC1_ASFTOANNEXG_BSF 0
 #define CONFIG_MOV2TEXTSUB_BSF 0
 #define CONFIG_NOISE_BSF 0
 #define CONFIG_REMOVE_EXTRADATA_BSF 0