| Index: source/config/Chromium/linux/ia32/config.h
|
| ===================================================================
|
| --- source/config/Chromium/linux/ia32/config.h (revision 59334)
|
| +++ source/config/Chromium/linux/ia32/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-everything --disable-network --disable-bzlib --disable-zlib --enable-shared --enable-libvpx --enable-decoder='theora,vorbis,libvpx' --enable-demuxer='ogg,matroska' --extra-cflags='-m32 -fPIC' --extra-ldflags='-m32 -L../../libvpx/linux32/lib'"
|
| +#define FFMPEG_CONFIGURATION "--disable-everything --disable-network --disable-bzlib --disable-zlib --enable-shared --enable-libvpx --enable-decoder='theora,vorbis,libvpx,pcm_u8,pcm_s16le,pcm_f32le' --enable-encoder=libvpx --enable-demuxer='ogg,matroska,wav' --extra-cflags='-m32 -fPIC' --extra-ldflags='-m32 -L../../libvpx/linux32/lib'"
|
| #define FFMPEG_LICENSE "LGPL version 2.1 or later"
|
| #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
|
| #define CC_TYPE "gcc"
|
| @@ -144,7 +144,7 @@
|
| #define CONFIG_BSFS 0
|
| #define CONFIG_DECODERS 1
|
| #define CONFIG_DEMUXERS 1
|
| -#define CONFIG_ENCODERS 0
|
| +#define CONFIG_ENCODERS 1
|
| #define CONFIG_FILTERS 0
|
| #define CONFIG_HWACCELS 0
|
| #define CONFIG_INDEVS 0
|
| @@ -425,20 +425,20 @@
|
| #define CONFIG_PCM_BLURAY_DECODER 0
|
| #define CONFIG_PCM_DVD_DECODER 0
|
| #define CONFIG_PCM_F32BE_DECODER 0
|
| -#define CONFIG_PCM_F32LE_DECODER 0
|
| +#define CONFIG_PCM_F32LE_DECODER 1
|
| #define CONFIG_PCM_F64BE_DECODER 0
|
| #define CONFIG_PCM_F64LE_DECODER 0
|
| #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
|
| @@ -459,6 +459,7 @@
|
| #define CONFIG_ADPCM_EA_R2_DECODER 0
|
| #define CONFIG_ADPCM_EA_R3_DECODER 0
|
| #define CONFIG_ADPCM_EA_XAS_DECODER 0
|
| +#define CONFIG_ADPCM_G722_DECODER 0
|
| #define CONFIG_ADPCM_G726_DECODER 0
|
| #define CONFIG_ADPCM_IMA_AMV_DECODER 0
|
| #define CONFIG_ADPCM_IMA_DK3_DECODER 0
|
| @@ -491,6 +492,8 @@
|
| #define CONFIG_LIBSCHROEDINGER_DECODER 0
|
| #define CONFIG_LIBSPEEX_DECODER 0
|
| #define CONFIG_LIBVPX_DECODER 1
|
| +#define CONFIG_A64MULTI_ENCODER 0
|
| +#define CONFIG_A64MULTI5_ENCODER 0
|
| #define CONFIG_ASV1_ENCODER 0
|
| #define CONFIG_ASV2_ENCODER 0
|
| #define CONFIG_BMP_ENCODER 0
|
| @@ -590,7 +593,7 @@
|
| #define CONFIG_LIBSCHROEDINGER_ENCODER 0
|
| #define CONFIG_LIBTHEORA_ENCODER 0
|
| #define CONFIG_LIBVORBIS_ENCODER 0
|
| -#define CONFIG_LIBVPX_ENCODER 0
|
| +#define CONFIG_LIBVPX_ENCODER 1
|
| #define CONFIG_LIBX264_ENCODER 0
|
| #define CONFIG_LIBXAVS_ENCODER 0
|
| #define CONFIG_LIBXVID_ENCODER 0
|
| @@ -768,7 +771,7 @@
|
| #define CONFIG_VOC_DEMUXER 0
|
| #define CONFIG_VQF_DEMUXER 0
|
| #define CONFIG_W64_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
|
|
|