diff options
| author | Luca Stefani <luca.stefani.ge1@gmail.com> | 2017-01-23 19:00:25 +0100 |
|---|---|---|
| committer | Zhao Wei Liew <zhaoweiliew@gmail.com> | 2017-02-18 12:27:11 +0800 |
| commit | f30c4de2a4516a362bb32ddcfd1164d13b6c71a3 (patch) | |
| tree | dd0ab798ddbe4727fbcfacf481afef22536dd8a3 /android/include/config-armv7-a.h | |
| parent | 0a27fb6d73b5e644ff9ea7099afbbdfc6c69e23a (diff) | |
| download | android_external_ffmpeg-f30c4de2a4516a362bb32ddcfd1164d13b6c71a3.tar.gz android_external_ffmpeg-f30c4de2a4516a362bb32ddcfd1164d13b6c71a3.tar.bz2 android_external_ffmpeg-f30c4de2a4516a362bb32ddcfd1164d13b6c71a3.zip | |
ffmpeg: android: Regenerate configsHEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001cm-13.0
* Disable unneeded docs
Change-Id: I77a8fd84c32c44b595cd98adccc497f1333fc447
Diffstat (limited to 'android/include/config-armv7-a.h')
| -rw-r--r-- | android/include/config-armv7-a.h | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/android/include/config-armv7-a.h b/android/include/config-armv7-a.h index 89987d34cc..99fe3baa01 100644 --- a/android/include/config-armv7-a.h +++ b/android/include/config-armv7-a.h @@ -1,7 +1,7 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H -#define FFMPEG_CONFIGURATION "--arch=arm --disable-neon --cpu=armv7-a --build_suffix= --cross-prefix=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi- --enable-cross-compile --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-arm --target-os=linux --disable-static --enable-shared --enable-optimizations --disable-doc --disable-symver --disable-ffmpeg --disable-ffplay --disable-ffprobe --disable-ffserver --disable-avdevice --disable-devices --disable-filters --disable-demuxer=srt --disable-demuxer=microdvd --disable-demuxer=jacosub --disable-demuxer=sami --disable-demuxer=realtext --disable-demuxer=dts --disable-demuxer=subviewer --disable-demuxer=subviewer1 --disable-demuxer=pjs --disable-demuxer=vplayer --disable-demuxer=mpl2 --disable-decoder=ass --disable-decoder=srt --disable-decoder=subrip --disable-decoder=microdvd --disable-decoder=jacosub --disable-decoder=sami --disable-decoder=realtext --disable-decoder=movtext --disable-decoder=subviewer --disable-decoder=subviewer1 --disable-decoder=pjs --disable-decoder=vplayer --disable-decoder=mpl2 --enable-zlib --enable-pic --disable-debug" +#define FFMPEG_CONFIGURATION "--arch=arm --disable-neon --cpu=armv7-a --build_suffix= --cross-prefix=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi- --enable-cross-compile --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-arm --target-os=linux --disable-static --enable-shared --enable-optimizations --disable-symver --disable-ffmpeg --disable-ffplay --disable-ffprobe --disable-ffserver --disable-avdevice --disable-devices --disable-filters --disable-demuxer=srt --disable-demuxer=microdvd --disable-demuxer=jacosub --disable-demuxer=sami --disable-demuxer=realtext --disable-demuxer=dts --disable-demuxer=subviewer --disable-demuxer=subviewer1 --disable-demuxer=pjs --disable-demuxer=vplayer --disable-demuxer=mpl2 --disable-decoder=ass --disable-decoder=srt --disable-decoder=subrip --disable-decoder=microdvd --disable-decoder=jacosub --disable-decoder=sami --disable-decoder=realtext --disable-decoder=movtext --disable-decoder=subviewer --disable-decoder=subviewer1 --disable-decoder=pjs --disable-decoder=vplayer --disable-decoder=mpl2 --enable-zlib --enable-pic --disable-debug --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages" #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2016 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -249,6 +249,10 @@ #undef HAVE_MIPS32R2 #endif #define HAVE_MIPS32R2 0 +#ifdef HAVE_MIPS32R5 +#undef HAVE_MIPS32R5 +#endif +#define HAVE_MIPS32R5 0 #ifdef HAVE_MIPS64R2 #undef HAVE_MIPS64R2 #endif @@ -421,6 +425,10 @@ #undef HAVE_MIPS32R2_EXTERNAL #endif #define HAVE_MIPS32R2_EXTERNAL 0 +#ifdef HAVE_MIPS32R5_EXTERNAL +#undef HAVE_MIPS32R5_EXTERNAL +#endif +#define HAVE_MIPS32R5_EXTERNAL 0 #ifdef HAVE_MIPS64R2_EXTERNAL #undef HAVE_MIPS64R2_EXTERNAL #endif @@ -593,6 +601,10 @@ #undef HAVE_MIPS32R2_INLINE #endif #define HAVE_MIPS32R2_INLINE 0 +#ifdef HAVE_MIPS32R5_INLINE +#undef HAVE_MIPS32R5_INLINE +#endif +#define HAVE_MIPS32R5_INLINE 0 #ifdef HAVE_MIPS64R2_INLINE #undef HAVE_MIPS64R2_INLINE #endif @@ -1494,8 +1506,8 @@ #define CONFIG_PROTOCOLS 1 #define CONFIG_DOC 0 #define CONFIG_HTMLPAGES 0 -#define CONFIG_MANPAGES 1 -#define CONFIG_PODPAGES 1 +#define CONFIG_MANPAGES 0 +#define CONFIG_PODPAGES 0 #define CONFIG_TXTPAGES 0 #define CONFIG_AVIO_READING_EXAMPLE 1 #define CONFIG_AVIO_DIR_CMD_EXAMPLE 1 |