diff options
| author | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-22 17:36:07 +0000 |
|---|---|---|
| committer | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-22 17:36:07 +0000 |
| commit | 74c8136d7c6fd35da216697e37446c90fbe0e0d8 (patch) | |
| tree | af9abe33b7ed2b9900f0390ab3f493a0eab2ed39 /third_party | |
| parent | ea87eee46258f8a3a75a2d244342b50721e4fb9d (diff) | |
| download | chromium_src-74c8136d7c6fd35da216697e37446c90fbe0e0d8.zip chromium_src-74c8136d7c6fd35da216697e37446c90fbe0e0d8.tar.gz chromium_src-74c8136d7c6fd35da216697e37446c90fbe0e0d8.tar.bz2 | |
ffmpeg configs with pthreads on windows
BUG=35850
TEST=build on windows and test ffmpeg dll sizes are reduced by about 30%.
Review URL: http://codereview.chromium.org/646001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39607 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/ffmpeg/source/config/Chrome/win/ia32/config.h | 10 | ||||
| -rw-r--r-- | third_party/ffmpeg/source/config/Chromium/win/ia32/config.h | 10 |
2 files changed, 10 insertions, 10 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 ef1a7c9..3ef6dd8 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 --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 --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-memalign-hack --cc=gcc-sjlj --prefix=./chrome-ffmpeg" +#define FFMPEG_CONFIGURATION "--enable-pthreads --disable-ffmpeg --disable-ffplay --disable-ffserver --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 --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-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" @@ -49,7 +49,7 @@ #define HAVE_BIGENDIAN 0 #define HAVE_BEOSTHREADS 0 #define HAVE_OS2THREADS 0 -#define HAVE_PTHREADS 0 +#define HAVE_PTHREADS 1 #define HAVE_W32THREADS 0 #define HAVE_ALSA_ASOUNDLIB_H 0 #define HAVE_ALTIVEC_H 0 @@ -69,8 +69,8 @@ #define HAVE_DLFCN_H 0 #define HAVE_DLOPEN 0 #define HAVE_DOS_PATHS 1 -#define HAVE_EBP_AVAILABLE 0 -#define HAVE_EBX_AVAILABLE 0 +#define HAVE_EBP_AVAILABLE 1 +#define HAVE_EBX_AVAILABLE 1 #define HAVE_EXP2 1 #define HAVE_EXP2F 1 #define HAVE_FAST_64BIT 0 @@ -122,7 +122,7 @@ #define HAVE_SYS_VIDEOIO_H 0 #define HAVE_TEN_OPERANDS 1 #define HAVE_TERMIOS_H 0 -#define HAVE_THREADS 0 +#define HAVE_THREADS 1 #define HAVE_TRUNCF 1 #define HAVE_VFP_ARGS 0 #define HAVE_VIRTUALALLOC 1 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 239156a..bd02ea7 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 --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 --enable-decoder=theora --enable-decoder=vorbis --enable-demuxer=ogg --enable-memalign-hack --cc=gcc-sjlj --prefix=./chromium-ffmpeg" +#define FFMPEG_CONFIGURATION "--enable-pthreads --disable-ffmpeg --disable-ffplay --disable-ffserver --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 --enable-decoder=theora --enable-decoder=vorbis --enable-demuxer=ogg --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" @@ -49,7 +49,7 @@ #define HAVE_BIGENDIAN 0 #define HAVE_BEOSTHREADS 0 #define HAVE_OS2THREADS 0 -#define HAVE_PTHREADS 0 +#define HAVE_PTHREADS 1 #define HAVE_W32THREADS 0 #define HAVE_ALSA_ASOUNDLIB_H 0 #define HAVE_ALTIVEC_H 0 @@ -69,8 +69,8 @@ #define HAVE_DLFCN_H 0 #define HAVE_DLOPEN 0 #define HAVE_DOS_PATHS 1 -#define HAVE_EBP_AVAILABLE 0 -#define HAVE_EBX_AVAILABLE 0 +#define HAVE_EBP_AVAILABLE 1 +#define HAVE_EBX_AVAILABLE 1 #define HAVE_EXP2 1 #define HAVE_EXP2F 1 #define HAVE_FAST_64BIT 0 @@ -122,7 +122,7 @@ #define HAVE_SYS_VIDEOIO_H 0 #define HAVE_TEN_OPERANDS 1 #define HAVE_TERMIOS_H 0 -#define HAVE_THREADS 0 +#define HAVE_THREADS 1 #define HAVE_TRUNCF 1 #define HAVE_VFP_ARGS 0 #define HAVE_VIRTUALALLOC 1 |