diff options
| author | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-10 03:07:44 +0000 |
|---|---|---|
| committer | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-10 03:07:44 +0000 |
| commit | 665112a28e524eed5892bc1eebb453ae3f0d64c3 (patch) | |
| tree | 954e596b35c1b0c2bf8c090f0fa7324286532283 /third_party/ffmpeg/source | |
| parent | c402da4e582bb1b5133270a2077104e752fc9704 (diff) | |
| download | chromium_src-665112a28e524eed5892bc1eebb453ae3f0d64c3.zip chromium_src-665112a28e524eed5892bc1eebb453ae3f0d64c3.tar.gz chromium_src-665112a28e524eed5892bc1eebb453ae3f0d64c3.tar.bz2 | |
ffmpeg remove ununsed ffmpeg source files, move some from chromium to chrome or chromeos, and add fpic for arm. remove bsf from all but arm
BUG=29934
TEST=make -j6 -r player_x11 BUILDTYPE=Release for all platforms and ensure they still link. Use size libffmpegsumo.so to confirm size has been reduced.
Review URL: http://codereview.chromium.org/483007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34226 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/ffmpeg/source')
5 files changed, 7 insertions, 7 deletions
diff --git a/third_party/ffmpeg/source/config/Chrome/linux/ia32/config.h b/third_party/ffmpeg/source/config/Chrome/linux/ia32/config.h index e1267b3..33a1337 100644 --- a/third_party/ffmpeg/source/config/Chrome/linux/ia32/config.h +++ b/third_party/ffmpeg/source/config/Chrome/linux/ia32/config.h @@ -101,7 +101,7 @@ #define HAVE_WINSOCK2_H 0 #define HAVE_XFORM_ASM 0 #define HAVE_YASM 1 -#define CONFIG_BSFS 1 +#define CONFIG_BSFS 0 #define CONFIG_DECODERS 1 #define CONFIG_DEMUXERS 1 #define CONFIG_ENCODERS 0 diff --git a/third_party/ffmpeg/source/config/Chrome/linux/x64/config.h b/third_party/ffmpeg/source/config/Chrome/linux/x64/config.h index d1c9b23..23a5e7d 100644 --- a/third_party/ffmpeg/source/config/Chrome/linux/x64/config.h +++ b/third_party/ffmpeg/source/config/Chrome/linux/x64/config.h @@ -101,7 +101,7 @@ #define HAVE_WINSOCK2_H 0 #define HAVE_XFORM_ASM 0 #define HAVE_YASM 1 -#define CONFIG_BSFS 1 +#define CONFIG_BSFS 0 #define CONFIG_DECODERS 1 #define CONFIG_DEMUXERS 1 #define CONFIG_ENCODERS 0 diff --git a/third_party/ffmpeg/source/config/Chrome/mac/ia32/config.h b/third_party/ffmpeg/source/config/Chrome/mac/ia32/config.h index 4c55bca..0e5e066 100644 --- a/third_party/ffmpeg/source/config/Chrome/mac/ia32/config.h +++ b/third_party/ffmpeg/source/config/Chrome/mac/ia32/config.h @@ -101,7 +101,7 @@ #define HAVE_WINSOCK2_H 0 #define HAVE_XFORM_ASM 0 #define HAVE_YASM 1 -#define CONFIG_BSFS 1 +#define CONFIG_BSFS 0 #define CONFIG_DECODERS 1 #define CONFIG_DEMUXERS 1 #define CONFIG_ENCODERS 0 diff --git a/third_party/ffmpeg/source/config/ChromeOS/linux/ia32/config.h b/third_party/ffmpeg/source/config/ChromeOS/linux/ia32/config.h index 9ab1fab..540ab69 100644 --- a/third_party/ffmpeg/source/config/ChromeOS/linux/ia32/config.h +++ b/third_party/ffmpeg/source/config/ChromeOS/linux/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 --enable-pthreads --disable-network --disable-encoders --disable-decoders --disable-hwaccels --disable-muxers --disable-demuxers --disable-parsers --disable-bsfs --disable-protocols --disable-devices --disable-filters --enable-decoder=aac --enable-decoder=h264 --enable-decoder=mp3 --enable-decoder=theora --enable-decoder=vorbis --disable-decoder=flac --enable-demuxer=mp3 --enable-demuxer=mov --enable-demuxer=ogg --enable-demuxer=avi --enable-demuxer=wav --enable-demuxer=asf --enable-decoder=wmv1 --enable-decoder=wmv2 --enable-decoder=wmv3 --enable-decoder=wmav1 --enable-decoder=wmav2 --enable-decoder=mpeg4 --enable-decoder=pcm_u8 --enable-decoder=pcm_s16le --enable-bsf=h264_mp4toannexb --enable-parser=mpegaudio --prefix=/tmp/nothing --enable-yasm --arch=i686 --extra-cflags=-m32 --extra-ldflags=-m32" +#define FFMPEG_CONFIGURATION "--disable-ffmpeg --disable-ffplay --disable-ffserver --enable-shared --disable-static --disable-debug --enable-pthreads --disable-network --disable-encoders --disable-decoders --disable-hwaccels --disable-muxers --disable-demuxers --disable-parsers --disable-bsfs --disable-protocols --disable-devices --disable-filters --enable-decoder=aac --enable-decoder=h264 --enable-decoder=mp3 --enable-decoder=theora --enable-decoder=vorbis --disable-decoder=flac --enable-demuxer=mp3 --enable-demuxer=mov --enable-demuxer=ogg --enable-demuxer=avi --enable-demuxer=wav --enable-demuxer=asf --enable-decoder=wmv1 --enable-decoder=wmv2 --enable-decoder=wmv3 --enable-decoder=wmav1 --enable-decoder=wmav2 --enable-decoder=mpeg4 --enable-decoder=pcm_u8 --enable-decoder=pcm_s16le --enable-parser=mpegaudio --prefix=/tmp/nothing --enable-yasm --arch=i686 --extra-cflags=-m32 --extra-ldflags=-m32" #define FFMPEG_DATADIR "/tmp/nothing/share/ffmpeg" #define ARCH_ALPHA 0 #define ARCH_ARM 0 @@ -101,7 +101,7 @@ #define HAVE_WINSOCK2_H 0 #define HAVE_XFORM_ASM 0 #define HAVE_YASM 1 -#define CONFIG_BSFS 1 +#define CONFIG_BSFS 0 #define CONFIG_DECODERS 1 #define CONFIG_DEMUXERS 1 #define CONFIG_ENCODERS 0 @@ -518,7 +518,7 @@ #define CONFIG_VC1_PARSER 0 #define CONFIG_VP3_PARSER 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 -#define CONFIG_H264_MP4TOANNEXB_BSF 1 +#define CONFIG_H264_MP4TOANNEXB_BSF 0 #define CONFIG_MPEG4VIDEO_ES_BSF 0 #define CONFIG_IMX_DUMP_HEADER_BSF 0 #define CONFIG_MJPEGA_DUMP_HEADER_BSF 0 diff --git a/third_party/ffmpeg/source/config/ChromiumOS/linux/arm/config.h b/third_party/ffmpeg/source/config/ChromiumOS/linux/arm/config.h index 68dbf2d..acebb257 100644 --- a/third_party/ffmpeg/source/config/ChromiumOS/linux/arm/config.h +++ b/third_party/ffmpeg/source/config/ChromiumOS/linux/arm/config.h @@ -101,7 +101,7 @@ #define HAVE_WINSOCK2_H 0 #define HAVE_XFORM_ASM 0 #define HAVE_YASM 0 -#define CONFIG_BSFS 1 +#define CONFIG_BSFS 0 #define CONFIG_DECODERS 1 #define CONFIG_DEMUXERS 1 #define CONFIG_ENCODERS 0 |