| Index: source/config/Chromium/linux/ia32/config.h
|
| ===================================================================
|
| --- source/config/Chromium/linux/ia32/config.h (revision 60302)
|
| +++ 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,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_CONFIGURATION "--disable-everything --disable-network --disable-bzlib --disable-zlib --disable-swscale --disable-amd3dnow --disable-amd3dnowext --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"
|
| @@ -9,7 +9,7 @@
|
| #define restrict restrict
|
| #define ASMALIGN(ZEROBITS) ".p2align " #ZEROBITS "\n\t"
|
| #define EXTERN_PREFIX ""
|
| -#define EXTERN_ASM
|
| +#define EXTERN_ASM
|
| #define ARCH_ALPHA 0
|
| #define ARCH_ARM 0
|
| #define ARCH_AVR32 0
|
| @@ -32,8 +32,8 @@
|
| #define ARCH_X86_32 1
|
| #define ARCH_X86_64 0
|
| #define HAVE_ALTIVEC 0
|
| -#define HAVE_AMD3DNOW 1
|
| -#define HAVE_AMD3DNOWEXT 1
|
| +#define HAVE_AMD3DNOW 0
|
| +#define HAVE_AMD3DNOWEXT 0
|
| #define HAVE_ARMV5TE 0
|
| #define HAVE_ARMV6 0
|
| #define HAVE_ARMV6T2 0
|
| @@ -165,7 +165,7 @@
|
| #define CONFIG_DWT 0
|
| #define CONFIG_DXVA2 0
|
| #define CONFIG_FASTDIV 1
|
| -#define CONFIG_FFMPEG 1
|
| +#define CONFIG_FFMPEG 0
|
| #define CONFIG_FFPLAY 0
|
| #define CONFIG_FFPROBE 1
|
| #define CONFIG_FFSERVER 0
|
| @@ -211,7 +211,7 @@
|
| #define CONFIG_SMALL 0
|
| #define CONFIG_SRAM 0
|
| #define CONFIG_STATIC 1
|
| -#define CONFIG_SWSCALE 1
|
| +#define CONFIG_SWSCALE 0
|
| #define CONFIG_SWSCALE_ALPHA 1
|
| #define CONFIG_VAAPI 0
|
| #define CONFIG_VDPAU 0
|
| @@ -650,6 +650,7 @@
|
| #define CONFIG_ANM_DEMUXER 0
|
| #define CONFIG_APC_DEMUXER 0
|
| #define CONFIG_APE_DEMUXER 0
|
| +#define CONFIG_APPLEHTTP_DEMUXER 0
|
| #define CONFIG_ASF_DEMUXER 0
|
| #define CONFIG_ASS_DEMUXER 0
|
| #define CONFIG_AU_DEMUXER 0
|
| @@ -679,6 +680,7 @@
|
| #define CONFIG_FLIC_DEMUXER 0
|
| #define CONFIG_FLV_DEMUXER 0
|
| #define CONFIG_FOURXM_DEMUXER 0
|
| +#define CONFIG_G722_DEMUXER 0
|
| #define CONFIG_GSM_DEMUXER 0
|
| #define CONFIG_GXF_DEMUXER 0
|
| #define CONFIG_H261_DEMUXER 0
|
| @@ -780,6 +782,7 @@
|
| #define CONFIG_YOP_DEMUXER 0
|
| #define CONFIG_YUV4MPEGPIPE_DEMUXER 0
|
| #define CONFIG_LIBNUT_DEMUXER 0
|
| +#define CONFIG_A64_MUXER 0
|
| #define CONFIG_AC3_MUXER 0
|
| #define CONFIG_ADTS_MUXER 0
|
| #define CONFIG_AIFF_MUXER 0
|
| @@ -804,6 +807,7 @@
|
| #define CONFIG_FLV_MUXER 0
|
| #define CONFIG_FRAMECRC_MUXER 0
|
| #define CONFIG_FRAMEMD5_MUXER 0
|
| +#define CONFIG_G722_MUXER 0
|
| #define CONFIG_GIF_MUXER 0
|
| #define CONFIG_GXF_MUXER 0
|
| #define CONFIG_H261_MUXER 0
|
| @@ -877,9 +881,12 @@
|
| #define CONFIG_WEBM_MUXER 0
|
| #define CONFIG_YUV4MPEGPIPE_MUXER 0
|
| #define CONFIG_LIBNUT_MUXER 0
|
| +#define CONFIG_ANULL_FILTER 0
|
| #define CONFIG_ASPECT_FILTER 0
|
| #define CONFIG_CROP_FILTER 0
|
| +#define CONFIG_FIFO_FILTER 0
|
| #define CONFIG_FORMAT_FILTER 0
|
| +#define CONFIG_HFLIP_FILTER 0
|
| #define CONFIG_NOFORMAT_FILTER 0
|
| #define CONFIG_NULL_FILTER 0
|
| #define CONFIG_PAD_FILTER 0
|
| @@ -889,7 +896,7 @@
|
| #define CONFIG_SLICIFY_FILTER 0
|
| #define CONFIG_UNSHARP_FILTER 0
|
| #define CONFIG_VFLIP_FILTER 0
|
| -#define CONFIG_BUFFER_FILTER 1
|
| +#define CONFIG_BUFFER_FILTER 0
|
| #define CONFIG_COLOR_FILTER 0
|
| #define CONFIG_NULLSRC_FILTER 0
|
| #define CONFIG_NULLSINK_FILTER 0
|
| @@ -897,6 +904,7 @@
|
| #define CONFIG_FILE_PROTOCOL 0
|
| #define CONFIG_GOPHER_PROTOCOL 0
|
| #define CONFIG_HTTP_PROTOCOL 0
|
| +#define CONFIG_MMSH_PROTOCOL 0
|
| #define CONFIG_MMST_PROTOCOL 0
|
| #define CONFIG_MD5_PROTOCOL 0
|
| #define CONFIG_PIPE_PROTOCOL 0
|
|
|