diff options
Diffstat (limited to 'third_party/ffmpeg/source/config')
3 files changed, 6 insertions, 6 deletions
diff --git a/third_party/ffmpeg/source/config/Chrome/linux/arm/config.h b/third_party/ffmpeg/source/config/Chrome/linux/arm/config.h index d06d99f..4aa42cd 100644 --- a/third_party/ffmpeg/source/config/Chrome/linux/arm/config.h +++ b/third_party/ffmpeg/source/config/Chrome/linux/arm/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=theora --enable-decoder=vorbis --enable-demuxer=ogg --prefix=/tmp/dummy --enable-cross-compile --arch=arm --enable-armv6t2 --extra-cflags='-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp'" +#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=theora --enable-decoder=vorbis --enable-demuxer=ogg --enable-bsf=h264_mp4toannexb --prefix=/tmp/dummy --enable-cross-compile --arch=arm --enable-armv6t2 --extra-cflags='-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp'" #define FFMPEG_DATADIR "/tmp/dummy/share/ffmpeg" #define ARCH_ALPHA 0 #define ARCH_ARM 1 @@ -541,7 +541,7 @@ #define CONFIG_VP3_PARSER 0 #define CONFIG_AAC_ADTSTOASC_BSF 0 #define CONFIG_DUMP_EXTRADATA_BSF 0 -#define CONFIG_H264_MP4TOANNEXB_BSF 0 +#define CONFIG_H264_MP4TOANNEXB_BSF 1 #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/Chrome/linux/ia32/config.h b/third_party/ffmpeg/source/config/Chrome/linux/ia32/config.h index 33a1337..6576902 100644 --- a/third_party/ffmpeg/source/config/Chrome/linux/ia32/config.h +++ b/third_party/ffmpeg/source/config/Chrome/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 --enable-demuxer=mp3 --enable-demuxer=mov --enable-demuxer=ogg --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 --enable-demuxer=mp3 --enable-demuxer=mov --enable-demuxer=ogg --enable-parser=mpegaudio --enable-bsf=h264_mp4toannexb --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 @@ -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 0 +#define CONFIG_H264_MP4TOANNEXB_BSF 1 #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/Chrome/linux/x64/config.h b/third_party/ffmpeg/source/config/Chrome/linux/x64/config.h index 23a5e7d..1113297 100644 --- a/third_party/ffmpeg/source/config/Chrome/linux/x64/config.h +++ b/third_party/ffmpeg/source/config/Chrome/linux/x64/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 --enable-demuxer=mp3 --enable-demuxer=mov --enable-demuxer=ogg --enable-parser=mpegaudio --prefix=./chrome-ffmpeg" +#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 --enable-demuxer=mp3 --enable-demuxer=mov --enable-demuxer=ogg --enable-parser=mpegaudio --enable-bsf=h264_mp4toannexb --prefix=./chrome-ffmpeg" #define FFMPEG_DATADIR "./chrome-ffmpeg/share/ffmpeg" #define ARCH_ALPHA 0 #define ARCH_ARM 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 0 +#define CONFIG_H264_MP4TOANNEXB_BSF 1 #define CONFIG_MPEG4VIDEO_ES_BSF 0 #define CONFIG_IMX_DUMP_HEADER_BSF 0 #define CONFIG_MJPEGA_DUMP_HEADER_BSF 0 |