ffmpeg enable wmapro

BUG=38321
TEST=make a wmapro using windows media encoder, and play it with chromeos

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

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

17 files changed, 41 insertions, 41 deletions

diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp
index e16dd90..068a1b3 100644
--- a/third_party/ffmpeg/ffmpeg.gyp
+++ b/third_party/ffmpeg/ffmpeg.gyp
@@ -2,7 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-# TODO(fbarchard): Add wmapro.
 # TODO(ajwong): Determine if we want to statically link libz.
 
 {
@@ -223,6 +222,7 @@
                 'source/patched-ffmpeg-mt/libavcodec/vc1dsp.c',
                 'source/patched-ffmpeg-mt/libavcodec/wma.c',
                 'source/patched-ffmpeg-mt/libavcodec/wmadec.c',
+                'source/patched-ffmpeg-mt/libavcodec/wmaprodec.c', # TODO(fbarchard): Review this file.
                 'source/patched-ffmpeg-mt/libavcodec/wmv2.c',
                 'source/patched-ffmpeg-mt/libavcodec/wmv2dec.c',
                 'source/patched-ffmpeg-mt/libavcodec/vc1_asftoannexg_bsf.c', # TODO(fbarchard): Review this file.
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 09f7bf9..0e0e2b3 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
@@ -608,12 +608,12 @@
 #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
 #define CONFIG_TEXT2MOVSUB_BSF 0
+#define CONFIG_VC1_ASFTORCV_BSF 0
+#define CONFIG_VC1_ASFTOANNEXG_BSF 0
 #define CONFIG_AAC_DEMUXER 0
 #define CONFIG_AC3_DEMUXER 0
 #define CONFIG_AEA_DEMUXER 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 d356cc8..8de3a19 100644
--- a/third_party/ffmpeg/source/config/Chrome/linux/arm/config.h
+++ b/third_party/ffmpeg/source/config/Chrome/linux/arm/config.h
@@ -608,12 +608,12 @@
 #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
 #define CONFIG_TEXT2MOVSUB_BSF 0
+#define CONFIG_VC1_ASFTORCV_BSF 0
+#define CONFIG_VC1_ASFTOANNEXG_BSF 0
 #define CONFIG_AAC_DEMUXER 0
 #define CONFIG_AC3_DEMUXER 0
 #define CONFIG_AEA_DEMUXER 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 595b0ac..58bea50 100644
--- a/third_party/ffmpeg/source/config/Chrome/linux/ia32/config.h
+++ b/third_party/ffmpeg/source/config/Chrome/linux/ia32/config.h
@@ -608,12 +608,12 @@
 #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
 #define CONFIG_TEXT2MOVSUB_BSF 0
+#define CONFIG_VC1_ASFTORCV_BSF 0
+#define CONFIG_VC1_ASFTOANNEXG_BSF 0
 #define CONFIG_AAC_DEMUXER 0
 #define CONFIG_AC3_DEMUXER 0
 #define CONFIG_AEA_DEMUXER 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 befeedf..b964430 100644
--- a/third_party/ffmpeg/source/config/Chrome/linux/x64/config.h
+++ b/third_party/ffmpeg/source/config/Chrome/linux/x64/config.h
@@ -608,12 +608,12 @@
 #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
 #define CONFIG_TEXT2MOVSUB_BSF 0
+#define CONFIG_VC1_ASFTORCV_BSF 0
+#define CONFIG_VC1_ASFTOANNEXG_BSF 0
 #define CONFIG_AAC_DEMUXER 0
 #define CONFIG_AC3_DEMUXER 0
 #define CONFIG_AEA_DEMUXER 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 545783f..0b18132 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 --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 --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 --target-os=linux --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 --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 --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=wmapro --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 --target-os=linux --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"
@@ -397,7 +397,7 @@
 #define CONFIG_VMDAUDIO_DECODER 0
 #define CONFIG_VORBIS_DECODER 1
 #define CONFIG_WAVPACK_DECODER 0
-#define CONFIG_WMAPRO_DECODER 0
+#define CONFIG_WMAPRO_DECODER 1
 #define CONFIG_WMAV1_DECODER 1
 #define CONFIG_WMAV2_DECODER 1
 #define CONFIG_WMAVOICE_DECODER 0
@@ -608,12 +608,12 @@
 #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
 #define CONFIG_TEXT2MOVSUB_BSF 0
+#define CONFIG_VC1_ASFTORCV_BSF 1
+#define CONFIG_VC1_ASFTOANNEXG_BSF 1
 #define CONFIG_AAC_DEMUXER 0
 #define CONFIG_AC3_DEMUXER 0
 #define CONFIG_AEA_DEMUXER 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 28d5c40..f295702 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 --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 --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 --target-os=linux --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 --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 --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=wmapro --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 --target-os=linux --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"
@@ -397,7 +397,7 @@
 #define CONFIG_VMDAUDIO_DECODER 0
 #define CONFIG_VORBIS_DECODER 1
 #define CONFIG_WAVPACK_DECODER 0
-#define CONFIG_WMAPRO_DECODER 0
+#define CONFIG_WMAPRO_DECODER 1
 #define CONFIG_WMAV1_DECODER 1
 #define CONFIG_WMAV2_DECODER 1
 #define CONFIG_WMAVOICE_DECODER 0
@@ -608,12 +608,12 @@
 #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
 #define CONFIG_TEXT2MOVSUB_BSF 0
+#define CONFIG_VC1_ASFTORCV_BSF 1
+#define CONFIG_VC1_ASFTOANNEXG_BSF 1
 #define CONFIG_AAC_DEMUXER 0
 #define CONFIG_AC3_DEMUXER 0
 #define CONFIG_AEA_DEMUXER 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 9a745be..e33fbb8 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 --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 --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_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 --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=wmapro --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"
@@ -397,7 +397,7 @@
 #define CONFIG_VMDAUDIO_DECODER 0
 #define CONFIG_VORBIS_DECODER 1
 #define CONFIG_WAVPACK_DECODER 0
-#define CONFIG_WMAPRO_DECODER 0
+#define CONFIG_WMAPRO_DECODER 1
 #define CONFIG_WMAV1_DECODER 1
 #define CONFIG_WMAV2_DECODER 1
 #define CONFIG_WMAVOICE_DECODER 0
@@ -608,12 +608,12 @@
 #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
 #define CONFIG_TEXT2MOVSUB_BSF 0
+#define CONFIG_VC1_ASFTORCV_BSF 1
+#define CONFIG_VC1_ASFTOANNEXG_BSF 1
 #define CONFIG_AAC_DEMUXER 0
 #define CONFIG_AC3_DEMUXER 0
 #define CONFIG_AEA_DEMUXER 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 1959efb..4111102 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 --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 --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_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 --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=wmapro --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"
@@ -397,7 +397,7 @@
 #define CONFIG_VMDAUDIO_DECODER 0
 #define CONFIG_VORBIS_DECODER 1
 #define CONFIG_WAVPACK_DECODER 0
-#define CONFIG_WMAPRO_DECODER 0
+#define CONFIG_WMAPRO_DECODER 1
 #define CONFIG_WMAV1_DECODER 1
 #define CONFIG_WMAV2_DECODER 1
 #define CONFIG_WMAVOICE_DECODER 0
@@ -608,12 +608,12 @@
 #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
 #define CONFIG_TEXT2MOVSUB_BSF 0
+#define CONFIG_VC1_ASFTORCV_BSF 1
+#define CONFIG_VC1_ASFTOANNEXG_BSF 1
 #define CONFIG_AAC_DEMUXER 0
 #define CONFIG_AC3_DEMUXER 0
 #define CONFIG_AEA_DEMUXER 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 aa75d83..660e803 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
@@ -608,12 +608,12 @@
 #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
 #define CONFIG_TEXT2MOVSUB_BSF 0
+#define CONFIG_VC1_ASFTORCV_BSF 0
+#define CONFIG_VC1_ASFTOANNEXG_BSF 0
 #define CONFIG_AAC_DEMUXER 0
 #define CONFIG_AC3_DEMUXER 0
 #define CONFIG_AEA_DEMUXER 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 c7ae512..b9af34b 100644
--- a/third_party/ffmpeg/source/config/Chromium/linux/arm/config.h
+++ b/third_party/ffmpeg/source/config/Chromium/linux/arm/config.h
@@ -608,12 +608,12 @@
 #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
 #define CONFIG_TEXT2MOVSUB_BSF 0
+#define CONFIG_VC1_ASFTORCV_BSF 0
+#define CONFIG_VC1_ASFTOANNEXG_BSF 0
 #define CONFIG_AAC_DEMUXER 0
 #define CONFIG_AC3_DEMUXER 0
 #define CONFIG_AEA_DEMUXER 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 1187e2b..0bfc5a9 100644
--- a/third_party/ffmpeg/source/config/Chromium/linux/ia32/config.h
+++ b/third_party/ffmpeg/source/config/Chromium/linux/ia32/config.h
@@ -608,12 +608,12 @@
 #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
 #define CONFIG_TEXT2MOVSUB_BSF 0
+#define CONFIG_VC1_ASFTORCV_BSF 0
+#define CONFIG_VC1_ASFTOANNEXG_BSF 0
 #define CONFIG_AAC_DEMUXER 0
 #define CONFIG_AC3_DEMUXER 0
 #define CONFIG_AEA_DEMUXER 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 94fcbcb..6a9b179 100644
--- a/third_party/ffmpeg/source/config/Chromium/linux/x64/config.h
+++ b/third_party/ffmpeg/source/config/Chromium/linux/x64/config.h
@@ -608,12 +608,12 @@
 #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
 #define CONFIG_TEXT2MOVSUB_BSF 0
+#define CONFIG_VC1_ASFTORCV_BSF 0
+#define CONFIG_VC1_ASFTOANNEXG_BSF 0
 #define CONFIG_AAC_DEMUXER 0
 #define CONFIG_AC3_DEMUXER 0
 #define CONFIG_AEA_DEMUXER 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 6e5df67..886adc3 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
@@ -608,12 +608,12 @@
 #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
 #define CONFIG_TEXT2MOVSUB_BSF 0
+#define CONFIG_VC1_ASFTORCV_BSF 0
+#define CONFIG_VC1_ASFTOANNEXG_BSF 0
 #define CONFIG_AAC_DEMUXER 0
 #define CONFIG_AC3_DEMUXER 0
 #define CONFIG_AEA_DEMUXER 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 e26d453..dfba42b 100644
--- a/third_party/ffmpeg/source/config/ChromiumOS/linux/arm/config.h
+++ b/third_party/ffmpeg/source/config/ChromiumOS/linux/arm/config.h
@@ -608,12 +608,12 @@
 #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
 #define CONFIG_TEXT2MOVSUB_BSF 0
+#define CONFIG_VC1_ASFTORCV_BSF 0
+#define CONFIG_VC1_ASFTOANNEXG_BSF 0
 #define CONFIG_AAC_DEMUXER 0
 #define CONFIG_AC3_DEMUXER 0
 #define CONFIG_AEA_DEMUXER 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 0914f16..92d1807 100644
--- a/third_party/ffmpeg/source/config/ChromiumOS/linux/ia32/config.h
+++ b/third_party/ffmpeg/source/config/ChromiumOS/linux/ia32/config.h
@@ -608,12 +608,12 @@
 #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
 #define CONFIG_TEXT2MOVSUB_BSF 0
+#define CONFIG_VC1_ASFTORCV_BSF 0
+#define CONFIG_VC1_ASFTOANNEXG_BSF 0
 #define CONFIG_AAC_DEMUXER 0
 #define CONFIG_AC3_DEMUXER 0
 #define CONFIG_AEA_DEMUXER 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 22eceeb..e94848f 100644
--- a/third_party/ffmpeg/source/config/ChromiumOS/linux/x64/config.h
+++ b/third_party/ffmpeg/source/config/ChromiumOS/linux/x64/config.h
@@ -608,12 +608,12 @@
 #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
 #define CONFIG_TEXT2MOVSUB_BSF 0
+#define CONFIG_VC1_ASFTORCV_BSF 0
+#define CONFIG_VC1_ASFTOANNEXG_BSF 0
 #define CONFIG_AAC_DEMUXER 0
 #define CONFIG_AC3_DEMUXER 0
 #define CONFIG_AEA_DEMUXER 0