diff options
| author | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-27 19:09:05 +0000 |
|---|---|---|
| committer | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-27 19:09:05 +0000 |
| commit | 1ecd2e7fed78fc9050f044ad6853746db9fc65ed (patch) | |
| tree | 282396a27c5312f9e74437a676f43b0f7acc4170 /third_party/ffmpeg | |
| parent | 3c427137b12fb5c56f3c455ff18b02997677a812 (diff) | |
| download | chromium_src-1ecd2e7fed78fc9050f044ad6853746db9fc65ed.zip chromium_src-1ecd2e7fed78fc9050f044ad6853746db9fc65ed.tar.gz chromium_src-1ecd2e7fed78fc9050f044ad6853746db9fc65ed.tar.bz2 | |
ffmpeg disable zlib explicitely in the configuration
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/1733020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45733 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/ffmpeg')
| -rw-r--r-- | third_party/ffmpeg/source/config/Chrome/win/ia32/config.h | 2 | ||||
| -rw-r--r-- | third_party/ffmpeg/source/config/Chromium/win/ia32/config.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/third_party/ffmpeg/source/config/Chrome/win/ia32/config.h b/third_party/ffmpeg/source/config/Chrome/win/ia32/config.h index d26fe77..e108ac2 100644 --- a/third_party/ffmpeg/source/config/Chrome/win/ia32/config.h +++ b/third_party/ffmpeg/source/config/Chrome/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 --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-pthreads --enable-yasm --enable-memalign-hack --cc=gcc-sjlj --extra-cflags=-O2 --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 --disable-bzlib --disable-zlib --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-pthreads --enable-yasm --enable-memalign-hack --cc=gcc-sjlj --prefix=./chrome-ffmpeg" #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define FFMPEG_DATADIR "./chrome-ffmpeg/share/ffmpeg" #define CC_TYPE "gcc" 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 cf1c093..031c91b 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 --enable-decoder=theora --enable-decoder=vorbis --enable-demuxer=ogg --enable-pthreads --enable-yasm --enable-memalign-hack --cc=gcc-sjlj --extra-cflags=-O2 --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-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" |