| Index: third_party/ffmpeg/source/config/Chromium/win/ia32/config.h
|
| diff --git a/third_party/ffmpeg/source/config/Chromium/win/ia32/config.h b/third_party/ffmpeg/source/config/Chromium/win/ia32/config.h
|
| index 031c91b9551468f9d87fb915880a1c33f50b85f8..7d9446a0965f4dfb3ab278a32f85757cdb1ab00f 100644
|
| --- a/third_party/ffmpeg/source/config/Chromium/win/ia32/config.h
|
| +++ b/third_party/ffmpeg/source/config/Chromium/win/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 --disable-bzlib --disable-zlib --enable-decoder=theora --enable-decoder=vorbis --enable-demuxer=ogg --enable-pthreads --enable-yasm --enable-memalign-hack --cc=gcc-sjlj --prefix=./chromium-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 --disable-bzlib --disable-zlib --enable-decoder=theora --enable-decoder=vorbis --enable-demuxer=ogg --enable-decoder=libvpx_vp8 --enable-demuxer=webm --extra-cflags='-O2 -I/d/src/vp8/decode/include -fno-strict-aliasing' --extra-ldflags=-L/d/src/vp8/decode/lib --extra-libs=-lvpx --enable-pthreads --enable-yasm --enable-memalign-hack --cc=gcc-sjlj --prefix=./chromium-ffmpeg"
|
| #define FFMPEG_LICENSE "LGPL version 2.1 or later"
|
| #define FFMPEG_DATADIR "./chromium-ffmpeg/share/ffmpeg"
|
| #define CC_TYPE "gcc"
|
| @@ -475,6 +475,7 @@
|
| #define CONFIG_LIBOPENJPEG_DECODER 0
|
| #define CONFIG_LIBSCHROEDINGER_DECODER 0
|
| #define CONFIG_LIBSPEEX_DECODER 0
|
| +#define CONFIG_LIBVPX_VP8_DECODER 1
|
| #define CONFIG_ASV1_ENCODER 0
|
| #define CONFIG_ASV2_ENCODER 0
|
| #define CONFIG_BMP_ENCODER 0
|
| @@ -573,6 +574,7 @@
|
| #define CONFIG_LIBSCHROEDINGER_ENCODER 0
|
| #define CONFIG_LIBTHEORA_ENCODER 0
|
| #define CONFIG_LIBVORBIS_ENCODER 0
|
| +#define CONFIG_LIBVPX_VP8_ENCODER 0
|
| #define CONFIG_LIBX264_ENCODER 0
|
| #define CONFIG_LIBXVID_ENCODER 0
|
| #define CONFIG_H263_VAAPI_HWACCEL 0
|
| @@ -744,6 +746,7 @@
|
| #define CONFIG_W64_DEMUXER 0
|
| #define CONFIG_WAV_DEMUXER 0
|
| #define CONFIG_WC3_DEMUXER 0
|
| +#define CONFIG_WEBM_DEMUXER 1
|
| #define CONFIG_WSAUD_DEMUXER 0
|
| #define CONFIG_WSVQA_DEMUXER 0
|
| #define CONFIG_WV_DEMUXER 0
|
| @@ -839,6 +842,7 @@
|
| #define CONFIG_VC1T_MUXER 0
|
| #define CONFIG_VOC_MUXER 0
|
| #define CONFIG_WAV_MUXER 0
|
| +#define CONFIG_WEBM_MUXER 0
|
| #define CONFIG_YUV4MPEGPIPE_MUXER 0
|
| #define CONFIG_LIBNUT_MUXER 0
|
| #define CONFIG_ASPECT_FILTER 0
|
|
|