diff options
| author | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-09 01:46:51 +0000 |
|---|---|---|
| committer | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-09 01:46:51 +0000 |
| commit | 89ee17c470fedd310b1ae3cc20f750a32530f8a6 (patch) | |
| tree | bf5a6d9c7238104d2d5750a4208619f153e6146f /third_party/ffmpeg/source | |
| parent | d7ab5a5ec2cca7371705d1d9125b6c2b6512fe0d (diff) | |
| download | chromium_src-89ee17c470fedd310b1ae3cc20f750a32530f8a6.zip chromium_src-89ee17c470fedd310b1ae3cc20f750a32530f8a6.tar.gz chromium_src-89ee17c470fedd310b1ae3cc20f750a32530f8a6.tar.bz2 | |
New file formats for ChromeOS: wmv, wma, avi and wav.
Review URL: http://codereview.chromium.org/466073
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34126 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/ffmpeg/source')
| -rw-r--r-- | third_party/ffmpeg/source/config/ChromeOS/linux/arm/config.h | 26 | ||||
| -rw-r--r-- | third_party/ffmpeg/source/config/ChromeOS/linux/ia32/config.h | 24 |
2 files changed, 25 insertions, 25 deletions
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 0b688db..efca54c 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 --enable-pthreads --disable-network --disable-encoders --disable-decoders --disable-hwaccels --disable-muxers --disable-demuxers --disable-parsers --disable-bsfs --disable-protocols --disable-devices --disable-filters --enable-decoder=aac --enable-decoder=h264 --enable-decoder=mp3 --enable-decoder=theora --enable-decoder=vorbis --enable-demuxer=mp3 --enable-demuxer=mov --enable-demuxer=ogg --enable-parser=mpegaudio --enable-bsf=h264_mp4toannexb --prefix=/tmp/nothing --enable-yasm --arch=i686 --extra-cflags=-m32 --extra-ldflags=-m32" +#define FFMPEG_CONFIGURATION "--disable-ffmpeg --disable-ffplay --disable-ffserver --enable-shared --disable-static --disable-debug --enable-pthreads --disable-network --disable-encoders --disable-decoders --disable-hwaccels --disable-muxers --disable-demuxers --disable-parsers --disable-bsfs --disable-protocols --disable-devices --disable-filters --enable-decoder=aac --enable-decoder=h264 --enable-decoder=mp3 --enable-decoder=theora --enable-decoder=vorbis --disable-decoder=flac --enable-demuxer=mp3 --enable-demuxer=mov --enable-demuxer=ogg --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-parser=mpegaudio --prefix=/tmp/nothing --enable-cross-compile --arch=arm --enable-armv6 --enable-armv6t2 --extra-cflags=\"-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp\"" #define FFMPEG_DATADIR "/tmp/nothing/share/ffmpeg" #define ARCH_ALPHA 0 #define ARCH_ARM 1 @@ -218,7 +218,7 @@ #define CONFIG_MPEG_XVMC_DECODER 0 #define CONFIG_MPEG1VIDEO_DECODER 0 #define CONFIG_MPEG2VIDEO_DECODER 0 -#define CONFIG_MPEG4_DECODER 0 +#define CONFIG_MPEG4_DECODER 1 #define CONFIG_MPEGVIDEO_DECODER 0 #define CONFIG_MPEG_VDPAU_DECODER 0 #define CONFIG_MPEG1_VDPAU_DECODER 0 @@ -280,9 +280,9 @@ #define CONFIG_VP6A_DECODER 0 #define CONFIG_VP6F_DECODER 0 #define CONFIG_VQA_DECODER 0 -#define CONFIG_WMV1_DECODER 0 -#define CONFIG_WMV2_DECODER 0 -#define CONFIG_WMV3_DECODER 0 +#define CONFIG_WMV1_DECODER 1 +#define CONFIG_WMV2_DECODER 1 +#define CONFIG_WMV3_DECODER 1 #define CONFIG_WMV3_VDPAU_DECODER 0 #define CONFIG_WNV1_DECODER 0 #define CONFIG_XAN_WC3_DECODER 0 @@ -324,8 +324,8 @@ #define CONFIG_VMDAUDIO_DECODER 0 #define CONFIG_VORBIS_DECODER 1 #define CONFIG_WAVPACK_DECODER 0 -#define CONFIG_WMAV1_DECODER 0 -#define CONFIG_WMAV2_DECODER 0 +#define CONFIG_WMAV1_DECODER 1 +#define CONFIG_WMAV2_DECODER 1 #define CONFIG_WS_SND1_DECODER 0 #define CONFIG_PCM_ALAW_DECODER 0 #define CONFIG_PCM_DVD_DECODER 0 @@ -336,14 +336,14 @@ #define CONFIG_PCM_MULAW_DECODER 0 #define CONFIG_PCM_S8_DECODER 0 #define CONFIG_PCM_S16BE_DECODER 0 -#define CONFIG_PCM_S16LE_DECODER 0 +#define CONFIG_PCM_S16LE_DECODER 1 #define CONFIG_PCM_S16LE_PLANAR_DECODER 0 #define CONFIG_PCM_S24BE_DECODER 0 #define CONFIG_PCM_S24DAUD_DECODER 0 #define CONFIG_PCM_S24LE_DECODER 0 #define CONFIG_PCM_S32BE_DECODER 0 #define CONFIG_PCM_S32LE_DECODER 0 -#define CONFIG_PCM_U8_DECODER 0 +#define CONFIG_PCM_U8_DECODER 1 #define CONFIG_PCM_U16BE_DECODER 0 #define CONFIG_PCM_U16LE_DECODER 0 #define CONFIG_PCM_U24BE_DECODER 0 @@ -519,7 +519,7 @@ #define CONFIG_VP3_PARSER 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 #define CONFIG_H264_MP4TOANNEXB_BSF 1 -#define CONFIG_MPEG4VIDEO_ES_BSF 1 +#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 @@ -534,10 +534,10 @@ #define CONFIG_AMR_DEMUXER 0 #define CONFIG_APC_DEMUXER 0 #define CONFIG_APE_DEMUXER 0 -#define CONFIG_ASF_DEMUXER 0 +#define CONFIG_ASF_DEMUXER 1 #define CONFIG_ASS_DEMUXER 0 #define CONFIG_AU_DEMUXER 0 -#define CONFIG_AVI_DEMUXER 0 +#define CONFIG_AVI_DEMUXER 1 #define CONFIG_AVISYNTH_DEMUXER 0 #define CONFIG_AVS_DEMUXER 0 #define CONFIG_BETHSOFTVID_DEMUXER 0 @@ -644,7 +644,7 @@ #define CONFIG_VMD_DEMUXER 0 #define CONFIG_VOC_DEMUXER 0 #define CONFIG_VQF_DEMUXER 0 -#define CONFIG_WAV_DEMUXER 0 +#define CONFIG_WAV_DEMUXER 1 #define CONFIG_WC3_DEMUXER 0 #define CONFIG_WSAUD_DEMUXER 0 #define CONFIG_WSVQA_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 b242ccc..9ab1fab 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 --enable-pthreads --disable-network --disable-encoders --disable-decoders --disable-hwaccels --disable-muxers --disable-demuxers --disable-parsers --disable-bsfs --disable-protocols --disable-devices --disable-filters --enable-decoder=aac --enable-decoder=h264 --enable-decoder=mp3 --enable-decoder=theora --enable-decoder=vorbis --enable-demuxer=mp3 --enable-demuxer=mov --enable-demuxer=ogg --enable-parser=mpegaudio --enable-bsf=h264_mp4toannexb --prefix=/tmp/nothing --enable-yasm --arch=i686 --extra-cflags=-m32 --extra-ldflags=-m32" +#define FFMPEG_CONFIGURATION "--disable-ffmpeg --disable-ffplay --disable-ffserver --enable-shared --disable-static --disable-debug --enable-pthreads --disable-network --disable-encoders --disable-decoders --disable-hwaccels --disable-muxers --disable-demuxers --disable-parsers --disable-bsfs --disable-protocols --disable-devices --disable-filters --enable-decoder=aac --enable-decoder=h264 --enable-decoder=mp3 --enable-decoder=theora --enable-decoder=vorbis --disable-decoder=flac --enable-demuxer=mp3 --enable-demuxer=mov --enable-demuxer=ogg --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-parser=mpegaudio --prefix=/tmp/nothing --enable-yasm --arch=i686 --extra-cflags=-m32 --extra-ldflags=-m32" #define FFMPEG_DATADIR "/tmp/nothing/share/ffmpeg" #define ARCH_ALPHA 0 #define ARCH_ARM 0 @@ -218,7 +218,7 @@ #define CONFIG_MPEG_XVMC_DECODER 0 #define CONFIG_MPEG1VIDEO_DECODER 0 #define CONFIG_MPEG2VIDEO_DECODER 0 -#define CONFIG_MPEG4_DECODER 0 +#define CONFIG_MPEG4_DECODER 1 #define CONFIG_MPEGVIDEO_DECODER 0 #define CONFIG_MPEG_VDPAU_DECODER 0 #define CONFIG_MPEG1_VDPAU_DECODER 0 @@ -280,9 +280,9 @@ #define CONFIG_VP6A_DECODER 0 #define CONFIG_VP6F_DECODER 0 #define CONFIG_VQA_DECODER 0 -#define CONFIG_WMV1_DECODER 0 -#define CONFIG_WMV2_DECODER 0 -#define CONFIG_WMV3_DECODER 0 +#define CONFIG_WMV1_DECODER 1 +#define CONFIG_WMV2_DECODER 1 +#define CONFIG_WMV3_DECODER 1 #define CONFIG_WMV3_VDPAU_DECODER 0 #define CONFIG_WNV1_DECODER 0 #define CONFIG_XAN_WC3_DECODER 0 @@ -324,8 +324,8 @@ #define CONFIG_VMDAUDIO_DECODER 0 #define CONFIG_VORBIS_DECODER 1 #define CONFIG_WAVPACK_DECODER 0 -#define CONFIG_WMAV1_DECODER 0 -#define CONFIG_WMAV2_DECODER 0 +#define CONFIG_WMAV1_DECODER 1 +#define CONFIG_WMAV2_DECODER 1 #define CONFIG_WS_SND1_DECODER 0 #define CONFIG_PCM_ALAW_DECODER 0 #define CONFIG_PCM_DVD_DECODER 0 @@ -336,14 +336,14 @@ #define CONFIG_PCM_MULAW_DECODER 0 #define CONFIG_PCM_S8_DECODER 0 #define CONFIG_PCM_S16BE_DECODER 0 -#define CONFIG_PCM_S16LE_DECODER 0 +#define CONFIG_PCM_S16LE_DECODER 1 #define CONFIG_PCM_S16LE_PLANAR_DECODER 0 #define CONFIG_PCM_S24BE_DECODER 0 #define CONFIG_PCM_S24DAUD_DECODER 0 #define CONFIG_PCM_S24LE_DECODER 0 #define CONFIG_PCM_S32BE_DECODER 0 #define CONFIG_PCM_S32LE_DECODER 0 -#define CONFIG_PCM_U8_DECODER 0 +#define CONFIG_PCM_U8_DECODER 1 #define CONFIG_PCM_U16BE_DECODER 0 #define CONFIG_PCM_U16LE_DECODER 0 #define CONFIG_PCM_U24BE_DECODER 0 @@ -534,10 +534,10 @@ #define CONFIG_AMR_DEMUXER 0 #define CONFIG_APC_DEMUXER 0 #define CONFIG_APE_DEMUXER 0 -#define CONFIG_ASF_DEMUXER 0 +#define CONFIG_ASF_DEMUXER 1 #define CONFIG_ASS_DEMUXER 0 #define CONFIG_AU_DEMUXER 0 -#define CONFIG_AVI_DEMUXER 0 +#define CONFIG_AVI_DEMUXER 1 #define CONFIG_AVISYNTH_DEMUXER 0 #define CONFIG_AVS_DEMUXER 0 #define CONFIG_BETHSOFTVID_DEMUXER 0 @@ -644,7 +644,7 @@ #define CONFIG_VMD_DEMUXER 0 #define CONFIG_VOC_DEMUXER 0 #define CONFIG_VQF_DEMUXER 0 -#define CONFIG_WAV_DEMUXER 0 +#define CONFIG_WAV_DEMUXER 1 #define CONFIG_WC3_DEMUXER 0 #define CONFIG_WSAUD_DEMUXER 0 #define CONFIG_WSVQA_DEMUXER 0 |