Index: third_party/ffmpeg/source/config/ChromeOS/linux/arm/config.h |
=================================================================== |
--- third_party/ffmpeg/source/config/ChromeOS/linux/arm/config.h (revision 42298) |
+++ third_party/ffmpeg/source/config/ChromeOS/linux/arm/config.h (working copy) |
@@ -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 |