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 | |
parent | 0a27fb6d73b5e644ff9ea7099afbbdfc6c69e23a (diff) | |
download | android_external_ffmpeg-cm-13.0.tar.gz android_external_ffmpeg-cm-13.0.tar.bz2 android_external_ffmpeg-cm-13.0.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
-rw-r--r-- | android/config-armv5te.mak | 13 | ||||
-rw-r--r-- | android/config-armv7-a-neon.mak | 13 | ||||
-rw-r--r-- | android/config-armv7-a.mak | 13 | ||||
-rw-r--r-- | android/config-armv8-a.mak | 13 | ||||
-rw-r--r-- | android/config-silvermont.mak | 15 | ||||
-rw-r--r-- | android/config-x86.mak | 18 | ||||
-rw-r--r-- | android/include/config-armv5te.h | 18 | ||||
-rw-r--r-- | android/include/config-armv7-a-neon.h | 18 | ||||
-rw-r--r-- | android/include/config-armv7-a.h | 18 | ||||
-rw-r--r-- | android/include/config-armv8-a.h | 18 | ||||
-rw-r--r-- | android/include/config-silvermont.h | 18 | ||||
-rw-r--r-- | android/include/config-x86.h | 18 | ||||
-rw-r--r-- | android/include/config.asm | 7 | ||||
-rwxr-xr-x | gen-android-configs | 2 |
14 files changed, 148 insertions, 54 deletions
diff --git a/android/config-armv5te.mak b/android/config-armv5te.mak index fbb57ee4bc..14f7badf91 100644 --- a/android/config-armv5te.mak +++ b/android/config-armv5te.mak @@ -1,7 +1,7 @@ # Automatically generated by configure - do not modify! ifndef FFMPEG_CONFIG_MAK FFMPEG_CONFIG_MAK=1 -FFMPEG_CONFIGURATION=--arch=arm --cpu=armv5te --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 +FFMPEG_CONFIGURATION=--arch=arm --cpu=armv5te --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 prefix=/usr/local LIBDIR=$(DESTDIR)${prefix}/lib SHLIBDIR=$(DESTDIR)${prefix}/lib @@ -40,7 +40,7 @@ LN_S=ln -s -f CPPFLAGS= --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-arm -isysroot ../../prebuilts/ndk/current/platforms/android-21/arch-arm -D_ISOC99_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Dstrtod=avpriv_strtod -DPIC -DZLIB_CONST CFLAGS= -march=armv5te -std=c99 -fomit-frame-pointer -fPIC -marm -pthread -Wdeclaration-after-statement -Wall -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wwrite-strings -Wtype-limits -Wundef -Wmissing-prototypes -Wno-pointer-to-int-cast -Wstrict-prototypes -Wempty-body -Wno-parentheses -Wno-switch -Wno-format-zero-length -Wno-pointer-sign -O3 -fno-math-errno -fno-signed-zeros -fno-tree-vectorize -Werror=format-security -Werror=implicit-function-declaration -Werror=missing-prototypes -Werror=return-type -Werror=vla -Wformat -fdiagnostics-color=auto -Wno-maybe-uninitialized CXXFLAGS= -D__STDC_CONSTANT_MACROS -OBJCFLAGS= +OBJCFLAGS= ASFLAGS= -march=armv5te -fPIC AS_C=-c AS_O=-o $@ @@ -97,7 +97,7 @@ HOSTCC_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@ HOSTCC_C=-c HOSTCC_O=-o $@ HOSTLD_O=-o $@ -TARGET_EXEC= +TARGET_EXEC= TARGET_PATH=$(CURDIR) TARGET_SAMPLES=$(SAMPLES) CFLAGS-ffplay= @@ -217,6 +217,7 @@ HAVE_SETEND=yes !HAVE_I686=yes !HAVE_MIPSFPU=yes !HAVE_MIPS32R2=yes +!HAVE_MIPS32R5=yes !HAVE_MIPS64R2=yes !HAVE_MIPS32R6=yes !HAVE_MIPS64R6=yes @@ -260,6 +261,7 @@ HAVE_VFP_EXTERNAL=yes !HAVE_I686_EXTERNAL=yes !HAVE_MIPSFPU_EXTERNAL=yes !HAVE_MIPS32R2_EXTERNAL=yes +!HAVE_MIPS32R5_EXTERNAL=yes !HAVE_MIPS64R2_EXTERNAL=yes !HAVE_MIPS32R6_EXTERNAL=yes !HAVE_MIPS64R6_EXTERNAL=yes @@ -303,6 +305,7 @@ HAVE_ARMV5TE_INLINE=yes !HAVE_I686_INLINE=yes !HAVE_MIPSFPU_INLINE=yes !HAVE_MIPS32R2_INLINE=yes +!HAVE_MIPS32R5_INLINE=yes !HAVE_MIPS64R2_INLINE=yes !HAVE_MIPS32R6_INLINE=yes !HAVE_MIPS64R6_INLINE=yes @@ -538,8 +541,8 @@ CONFIG_MUXERS=yes CONFIG_PROTOCOLS=yes !CONFIG_DOC=yes !CONFIG_HTMLPAGES=yes -CONFIG_MANPAGES=yes -CONFIG_PODPAGES=yes +!CONFIG_MANPAGES=yes +!CONFIG_PODPAGES=yes !CONFIG_TXTPAGES=yes CONFIG_AVIO_READING_EXAMPLE=yes CONFIG_AVIO_DIR_CMD_EXAMPLE=yes diff --git a/android/config-armv7-a-neon.mak b/android/config-armv7-a-neon.mak index 2e458b3fb7..21639093c5 100644 --- a/android/config-armv7-a-neon.mak +++ b/android/config-armv7-a-neon.mak @@ -1,7 +1,7 @@ # Automatically generated by configure - do not modify! ifndef FFMPEG_CONFIG_MAK FFMPEG_CONFIG_MAK=1 -FFMPEG_CONFIGURATION=--arch=arm --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 +FFMPEG_CONFIGURATION=--arch=arm --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 prefix=/usr/local LIBDIR=$(DESTDIR)${prefix}/lib SHLIBDIR=$(DESTDIR)${prefix}/lib @@ -40,7 +40,7 @@ LN_S=ln -s -f CPPFLAGS= --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-arm -isysroot ../../prebuilts/ndk/current/platforms/android-21/arch-arm -D_ISOC99_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Dstrtod=avpriv_strtod -DPIC -DZLIB_CONST CFLAGS= -march=armv7-a -std=c99 -fomit-frame-pointer -fPIC -marm -pthread -Wdeclaration-after-statement -Wall -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wwrite-strings -Wtype-limits -Wundef -Wmissing-prototypes -Wno-pointer-to-int-cast -Wstrict-prototypes -Wempty-body -Wno-parentheses -Wno-switch -Wno-format-zero-length -Wno-pointer-sign -O3 -fno-math-errno -fno-signed-zeros -fno-tree-vectorize -Werror=format-security -Werror=implicit-function-declaration -Werror=missing-prototypes -Werror=return-type -Werror=vla -Wformat -fdiagnostics-color=auto -Wno-maybe-uninitialized CXXFLAGS= -D__STDC_CONSTANT_MACROS -OBJCFLAGS= +OBJCFLAGS= ASFLAGS= -march=armv7-a -fPIC AS_C=-c AS_O=-o $@ @@ -97,7 +97,7 @@ HOSTCC_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@ HOSTCC_C=-c HOSTCC_O=-o $@ HOSTLD_O=-o $@ -TARGET_EXEC= +TARGET_EXEC= TARGET_PATH=$(CURDIR) TARGET_SAMPLES=$(SAMPLES) CFLAGS-ffplay= @@ -217,6 +217,7 @@ HAVE_SETEND=yes !HAVE_I686=yes !HAVE_MIPSFPU=yes !HAVE_MIPS32R2=yes +!HAVE_MIPS32R5=yes !HAVE_MIPS64R2=yes !HAVE_MIPS32R6=yes !HAVE_MIPS64R6=yes @@ -260,6 +261,7 @@ HAVE_SETEND_EXTERNAL=yes !HAVE_I686_EXTERNAL=yes !HAVE_MIPSFPU_EXTERNAL=yes !HAVE_MIPS32R2_EXTERNAL=yes +!HAVE_MIPS32R5_EXTERNAL=yes !HAVE_MIPS64R2_EXTERNAL=yes !HAVE_MIPS32R6_EXTERNAL=yes !HAVE_MIPS64R6_EXTERNAL=yes @@ -303,6 +305,7 @@ HAVE_SETEND_INLINE=yes !HAVE_I686_INLINE=yes !HAVE_MIPSFPU_INLINE=yes !HAVE_MIPS32R2_INLINE=yes +!HAVE_MIPS32R5_INLINE=yes !HAVE_MIPS64R2_INLINE=yes !HAVE_MIPS32R6_INLINE=yes !HAVE_MIPS64R6_INLINE=yes @@ -538,8 +541,8 @@ CONFIG_MUXERS=yes CONFIG_PROTOCOLS=yes !CONFIG_DOC=yes !CONFIG_HTMLPAGES=yes -CONFIG_MANPAGES=yes -CONFIG_PODPAGES=yes +!CONFIG_MANPAGES=yes +!CONFIG_PODPAGES=yes !CONFIG_TXTPAGES=yes CONFIG_AVIO_READING_EXAMPLE=yes CONFIG_AVIO_DIR_CMD_EXAMPLE=yes diff --git a/android/config-armv7-a.mak b/android/config-armv7-a.mak index 9939b7f62b..6069e5ab5d 100644 --- a/android/config-armv7-a.mak +++ b/android/config-armv7-a.mak @@ -1,7 +1,7 @@ # Automatically generated by configure - do not modify! ifndef FFMPEG_CONFIG_MAK FFMPEG_CONFIG_MAK=1 -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 +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 prefix=/usr/local LIBDIR=$(DESTDIR)${prefix}/lib SHLIBDIR=$(DESTDIR)${prefix}/lib @@ -40,7 +40,7 @@ LN_S=ln -s -f CPPFLAGS= --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-arm -isysroot ../../prebuilts/ndk/current/platforms/android-21/arch-arm -D_ISOC99_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Dstrtod=avpriv_strtod -DPIC -DZLIB_CONST CFLAGS= -march=armv7-a -std=c99 -fomit-frame-pointer -fPIC -marm -pthread -Wdeclaration-after-statement -Wall -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wwrite-strings -Wtype-limits -Wundef -Wmissing-prototypes -Wno-pointer-to-int-cast -Wstrict-prototypes -Wempty-body -Wno-parentheses -Wno-switch -Wno-format-zero-length -Wno-pointer-sign -O3 -fno-math-errno -fno-signed-zeros -fno-tree-vectorize -Werror=format-security -Werror=implicit-function-declaration -Werror=missing-prototypes -Werror=return-type -Werror=vla -Wformat -fdiagnostics-color=auto -Wno-maybe-uninitialized CXXFLAGS= -D__STDC_CONSTANT_MACROS -OBJCFLAGS= +OBJCFLAGS= ASFLAGS= -march=armv7-a -fPIC AS_C=-c AS_O=-o $@ @@ -97,7 +97,7 @@ HOSTCC_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@ HOSTCC_C=-c HOSTCC_O=-o $@ HOSTLD_O=-o $@ -TARGET_EXEC= +TARGET_EXEC= TARGET_PATH=$(CURDIR) TARGET_SAMPLES=$(SAMPLES) CFLAGS-ffplay= @@ -217,6 +217,7 @@ HAVE_SETEND=yes !HAVE_I686=yes !HAVE_MIPSFPU=yes !HAVE_MIPS32R2=yes +!HAVE_MIPS32R5=yes !HAVE_MIPS64R2=yes !HAVE_MIPS32R6=yes !HAVE_MIPS64R6=yes @@ -260,6 +261,7 @@ HAVE_SETEND_EXTERNAL=yes !HAVE_I686_EXTERNAL=yes !HAVE_MIPSFPU_EXTERNAL=yes !HAVE_MIPS32R2_EXTERNAL=yes +!HAVE_MIPS32R5_EXTERNAL=yes !HAVE_MIPS64R2_EXTERNAL=yes !HAVE_MIPS32R6_EXTERNAL=yes !HAVE_MIPS64R6_EXTERNAL=yes @@ -303,6 +305,7 @@ HAVE_SETEND_INLINE=yes !HAVE_I686_INLINE=yes !HAVE_MIPSFPU_INLINE=yes !HAVE_MIPS32R2_INLINE=yes +!HAVE_MIPS32R5_INLINE=yes !HAVE_MIPS64R2_INLINE=yes !HAVE_MIPS32R6_INLINE=yes !HAVE_MIPS64R6_INLINE=yes @@ -538,8 +541,8 @@ CONFIG_MUXERS=yes CONFIG_PROTOCOLS=yes !CONFIG_DOC=yes !CONFIG_HTMLPAGES=yes -CONFIG_MANPAGES=yes -CONFIG_PODPAGES=yes +!CONFIG_MANPAGES=yes +!CONFIG_PODPAGES=yes !CONFIG_TXTPAGES=yes CONFIG_AVIO_READING_EXAMPLE=yes CONFIG_AVIO_DIR_CMD_EXAMPLE=yes diff --git a/android/config-armv8-a.mak b/android/config-armv8-a.mak index 5eb69cd9b6..27e12d3128 100644 --- a/android/config-armv8-a.mak +++ b/android/config-armv8-a.mak @@ -1,7 +1,7 @@ # Automatically generated by configure - do not modify! ifndef FFMPEG_CONFIG_MAK FFMPEG_CONFIG_MAK=1 -FFMPEG_CONFIGURATION=--arch=aarch64 --target-os=linux --enable-cross-compile --cross-prefix=../../prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin/aarch64-linux-android- --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-arm64 --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 +FFMPEG_CONFIGURATION=--arch=aarch64 --target-os=linux --enable-cross-compile --cross-prefix=../../prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin/aarch64-linux-android- --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-arm64 --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 prefix=/usr/local LIBDIR=$(DESTDIR)${prefix}/lib SHLIBDIR=$(DESTDIR)${prefix}/lib @@ -40,7 +40,7 @@ LN_S=ln -s -f CPPFLAGS= --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-arm64 -isysroot ../../prebuilts/ndk/current/platforms/android-21/arch-arm64 -D_ISOC99_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Dstrtod=avpriv_strtod -DPIC -DZLIB_CONST CFLAGS= -std=c99 -fomit-frame-pointer -fPIC -pthread -Wdeclaration-after-statement -Wall -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wwrite-strings -Wtype-limits -Wundef -Wmissing-prototypes -Wno-pointer-to-int-cast -Wstrict-prototypes -Wempty-body -Wno-parentheses -Wno-switch -Wno-format-zero-length -Wno-pointer-sign -O3 -fno-math-errno -fno-signed-zeros -fno-tree-vectorize -Werror=format-security -Werror=implicit-function-declaration -Werror=missing-prototypes -Werror=return-type -Werror=vla -Wformat -fdiagnostics-color=auto -Wno-maybe-uninitialized CXXFLAGS= -D__STDC_CONSTANT_MACROS -OBJCFLAGS= +OBJCFLAGS= ASFLAGS= -fPIC AS_C=-c AS_O=-o $@ @@ -97,7 +97,7 @@ HOSTCC_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@ HOSTCC_C=-c HOSTCC_O=-o $@ HOSTLD_O=-o $@ -TARGET_EXEC= +TARGET_EXEC= TARGET_PATH=$(CURDIR) TARGET_SAMPLES=$(SAMPLES) CFLAGS-ffplay= @@ -217,6 +217,7 @@ HAVE_VFP=yes !HAVE_I686=yes !HAVE_MIPSFPU=yes !HAVE_MIPS32R2=yes +!HAVE_MIPS32R5=yes !HAVE_MIPS64R2=yes !HAVE_MIPS32R6=yes !HAVE_MIPS64R6=yes @@ -260,6 +261,7 @@ HAVE_VFP_EXTERNAL=yes !HAVE_I686_EXTERNAL=yes !HAVE_MIPSFPU_EXTERNAL=yes !HAVE_MIPS32R2_EXTERNAL=yes +!HAVE_MIPS32R5_EXTERNAL=yes !HAVE_MIPS64R2_EXTERNAL=yes !HAVE_MIPS32R6_EXTERNAL=yes !HAVE_MIPS64R6_EXTERNAL=yes @@ -303,6 +305,7 @@ HAVE_VFP_INLINE=yes !HAVE_I686_INLINE=yes !HAVE_MIPSFPU_INLINE=yes !HAVE_MIPS32R2_INLINE=yes +!HAVE_MIPS32R5_INLINE=yes !HAVE_MIPS64R2_INLINE=yes !HAVE_MIPS32R6_INLINE=yes !HAVE_MIPS64R6_INLINE=yes @@ -538,8 +541,8 @@ CONFIG_MUXERS=yes CONFIG_PROTOCOLS=yes !CONFIG_DOC=yes !CONFIG_HTMLPAGES=yes -CONFIG_MANPAGES=yes -CONFIG_PODPAGES=yes +!CONFIG_MANPAGES=yes +!CONFIG_PODPAGES=yes !CONFIG_TXTPAGES=yes CONFIG_AVIO_READING_EXAMPLE=yes CONFIG_AVIO_DIR_CMD_EXAMPLE=yes diff --git a/android/config-silvermont.mak b/android/config-silvermont.mak index 202df40c0a..77b8a51860 100644 --- a/android/config-silvermont.mak +++ b/android/config-silvermont.mak @@ -1,7 +1,7 @@ # Automatically generated by configure - do not modify! ifndef FFMPEG_CONFIG_MAK FFMPEG_CONFIG_MAK=1 -FFMPEG_CONFIGURATION=--arch=x86 --cpu=silvermont --build_suffix= --cross-prefix=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android- --enable-cross-compile --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-x86 --target-os=linux --extra-cflags=-m32 --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 +FFMPEG_CONFIGURATION=--arch=x86 --cpu=silvermont --build_suffix= --cross-prefix=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android- --enable-cross-compile --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-x86 --target-os=linux --extra-cflags=-m32 --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 prefix=/usr/local LIBDIR=$(DESTDIR)${prefix}/lib SHLIBDIR=$(DESTDIR)${prefix}/lib @@ -38,9 +38,9 @@ STRIP=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linu CP=cp -p LN_S=ln -s -f CPPFLAGS= --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-x86 -isysroot ../../prebuilts/ndk/current/platforms/android-21/arch-x86 -D_ISOC99_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Dstrtod=avpriv_strtod -DPIC -DZLIB_CONST -CFLAGS= -m32 -march=silvermont -std=c99 -fomit-frame-pointer -fPIC -pthread -Wdeclaration-after-statement -Wall -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wwrite-strings -Wtype-limits -Wundef -Wmissing-prototypes -Wno-pointer-to-int-cast -Wstrict-prototypes -Wempty-body -Wno-parentheses -Wno-switch -Wno-format-zero-length -Wno-pointer-sign -O3 -fno-math-errno -fno-signed-zeros -Werror=format-security -Werror=implicit-function-declaration -Werror=missing-prototypes -Werror=return-type -Werror=vla -Wformat -fdiagnostics-color=auto -Wno-maybe-uninitialized +CFLAGS= -m32 -march=silvermont -std=c99 -fomit-frame-pointer -fPIC -pthread -Wdeclaration-after-statement -Wall -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wwrite-strings -Wtype-limits -Wundef -Wmissing-prototypes -Wno-pointer-to-int-cast -Wstrict-prototypes -Wempty-body -Wno-parentheses -Wno-switch -Wno-format-zero-length -Wno-pointer-sign -O3 -fno-math-errno -fno-signed-zeros -fno-tree-vectorize -Werror=format-security -Werror=implicit-function-declaration -Werror=missing-prototypes -Werror=return-type -Werror=vla -Wformat -fdiagnostics-color=auto -Wno-maybe-uninitialized CXXFLAGS= -D__STDC_CONSTANT_MACROS -OBJCFLAGS= +OBJCFLAGS= ASFLAGS= -m32 -march=silvermont -fPIC AS_C=-c AS_O=-o $@ @@ -97,7 +97,7 @@ HOSTCC_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@ HOSTCC_C=-c HOSTCC_O=-o $@ HOSTLD_O=-o $@ -TARGET_EXEC= +TARGET_EXEC= TARGET_PATH=$(CURDIR) TARGET_SAMPLES=$(SAMPLES) CFLAGS-ffplay= @@ -217,6 +217,7 @@ HAVE_CPUNOP=yes HAVE_I686=yes !HAVE_MIPSFPU=yes !HAVE_MIPS32R2=yes +!HAVE_MIPS32R5=yes !HAVE_MIPS64R2=yes !HAVE_MIPS32R6=yes !HAVE_MIPS64R6=yes @@ -260,6 +261,7 @@ HAVE_XOP_EXTERNAL=yes !HAVE_I686_EXTERNAL=yes !HAVE_MIPSFPU_EXTERNAL=yes !HAVE_MIPS32R2_EXTERNAL=yes +!HAVE_MIPS32R5_EXTERNAL=yes !HAVE_MIPS64R2_EXTERNAL=yes !HAVE_MIPS32R6_EXTERNAL=yes !HAVE_MIPS64R6_EXTERNAL=yes @@ -303,6 +305,7 @@ HAVE_XOP_INLINE=yes !HAVE_I686_INLINE=yes !HAVE_MIPSFPU_INLINE=yes !HAVE_MIPS32R2_INLINE=yes +!HAVE_MIPS32R5_INLINE=yes !HAVE_MIPS64R2_INLINE=yes !HAVE_MIPS32R6_INLINE=yes !HAVE_MIPS64R6_INLINE=yes @@ -538,8 +541,8 @@ CONFIG_MUXERS=yes CONFIG_PROTOCOLS=yes !CONFIG_DOC=yes !CONFIG_HTMLPAGES=yes -CONFIG_MANPAGES=yes -CONFIG_PODPAGES=yes +!CONFIG_MANPAGES=yes +!CONFIG_PODPAGES=yes !CONFIG_TXTPAGES=yes CONFIG_AVIO_READING_EXAMPLE=yes CONFIG_AVIO_DIR_CMD_EXAMPLE=yes diff --git a/android/config-x86.mak b/android/config-x86.mak index 2d7c14a06f..9e64a4236d 100644 --- a/android/config-x86.mak +++ b/android/config-x86.mak @@ -1,7 +1,7 @@ # Automatically generated by configure - do not modify! ifndef FFMPEG_CONFIG_MAK FFMPEG_CONFIG_MAK=1 -FFMPEG_CONFIGURATION=--arch=x86 --cpu=i686 --build_suffix= --cross-prefix=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android- --enable-cross-compile --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-x86 --target-os=linux --extra-cflags=-m32 --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 +FFMPEG_CONFIGURATION=--arch=x86 --cpu=i686 --build_suffix= --cross-prefix=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android- --enable-cross-compile --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-x86 --target-os=linux --extra-cflags=-m32 --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 prefix=/usr/local LIBDIR=$(DESTDIR)${prefix}/lib SHLIBDIR=$(DESTDIR)${prefix}/lib @@ -28,7 +28,8 @@ DEPCC=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linu DEPCCFLAGS= $(CPPFLAGS) DEPAS=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android-gcc DEPASFLAGS= $(CPPFLAGS) -DEPYASM=$(YASM) +YASM=yasm +DEPYASM=yasm AR=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android-ar ARFLAGS=rcD AR_O=$@ @@ -37,9 +38,9 @@ STRIP=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linu CP=cp -p LN_S=ln -s -f CPPFLAGS= --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-x86 -isysroot ../../prebuilts/ndk/current/platforms/android-21/arch-x86 -D_ISOC99_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Dstrtod=avpriv_strtod -DPIC -DZLIB_CONST -CFLAGS= -m32 -march=i686 -std=c99 -fomit-frame-pointer -fPIC -pthread -Wdeclaration-after-statement -Wall -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wwrite-strings -Wtype-limits -Wundef -Wmissing-prototypes -Wno-pointer-to-int-cast -Wstrict-prototypes -Wempty-body -Wno-parentheses -Wno-switch -Wno-format-zero-length -Wno-pointer-sign -O3 -fno-math-errno -fno-signed-zeros -Werror=format-security -Werror=implicit-function-declaration -Werror=missing-prototypes -Werror=return-type -Werror=vla -Wformat -fdiagnostics-color=auto -Wno-maybe-uninitialized +CFLAGS= -m32 -march=i686 -std=c99 -fomit-frame-pointer -fPIC -pthread -Wdeclaration-after-statement -Wall -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wwrite-strings -Wtype-limits -Wundef -Wmissing-prototypes -Wno-pointer-to-int-cast -Wstrict-prototypes -Wempty-body -Wno-parentheses -Wno-switch -Wno-format-zero-length -Wno-pointer-sign -O3 -fno-math-errno -fno-signed-zeros -fno-tree-vectorize -Werror=format-security -Werror=implicit-function-declaration -Werror=missing-prototypes -Werror=return-type -Werror=vla -Wformat -fdiagnostics-color=auto -Wno-maybe-uninitialized CXXFLAGS= -D__STDC_CONSTANT_MACROS -OBJCFLAGS= +OBJCFLAGS= ASFLAGS= -m32 -march=i686 -fPIC AS_C=-c AS_O=-o $@ @@ -96,7 +97,7 @@ HOSTCC_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@ HOSTCC_C=-c HOSTCC_O=-o $@ HOSTLD_O=-o $@ -TARGET_EXEC= +TARGET_EXEC= TARGET_PATH=$(CURDIR) TARGET_SAMPLES=$(SAMPLES) CFLAGS-ffplay= @@ -216,6 +217,7 @@ HAVE_CPUNOP=yes HAVE_I686=yes !HAVE_MIPSFPU=yes !HAVE_MIPS32R2=yes +!HAVE_MIPS32R5=yes !HAVE_MIPS64R2=yes !HAVE_MIPS32R6=yes !HAVE_MIPS64R6=yes @@ -259,6 +261,7 @@ HAVE_XOP_EXTERNAL=yes !HAVE_I686_EXTERNAL=yes !HAVE_MIPSFPU_EXTERNAL=yes !HAVE_MIPS32R2_EXTERNAL=yes +!HAVE_MIPS32R5_EXTERNAL=yes !HAVE_MIPS64R2_EXTERNAL=yes !HAVE_MIPS32R6_EXTERNAL=yes !HAVE_MIPS64R6_EXTERNAL=yes @@ -302,6 +305,7 @@ HAVE_XOP_INLINE=yes !HAVE_I686_INLINE=yes !HAVE_MIPSFPU_INLINE=yes !HAVE_MIPS32R2_INLINE=yes +!HAVE_MIPS32R5_INLINE=yes !HAVE_MIPS64R2_INLINE=yes !HAVE_MIPS32R6_INLINE=yes !HAVE_MIPS64R6_INLINE=yes @@ -537,8 +541,8 @@ CONFIG_MUXERS=yes CONFIG_PROTOCOLS=yes !CONFIG_DOC=yes !CONFIG_HTMLPAGES=yes -CONFIG_MANPAGES=yes -CONFIG_PODPAGES=yes +!CONFIG_MANPAGES=yes +!CONFIG_PODPAGES=yes !CONFIG_TXTPAGES=yes CONFIG_AVIO_READING_EXAMPLE=yes CONFIG_AVIO_DIR_CMD_EXAMPLE=yes diff --git a/android/include/config-armv5te.h b/android/include/config-armv5te.h index 92f19d3c86..d978cf4f12 100644 --- a/android/include/config-armv5te.h +++ b/android/include/config-armv5te.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 --cpu=armv5te --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 --cpu=armv5te --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 diff --git a/android/include/config-armv7-a-neon.h b/android/include/config-armv7-a-neon.h index 70f7ba98b2..08780275dc 100644 --- a/android/include/config-armv7-a-neon.h +++ b/android/include/config-armv7-a-neon.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 --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 --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 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 diff --git a/android/include/config-armv8-a.h b/android/include/config-armv8-a.h index 38a37b675d..7070eda108 100644 --- a/android/include/config-armv8-a.h +++ b/android/include/config-armv8-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=aarch64 --target-os=linux --enable-cross-compile --cross-prefix=../../prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin/aarch64-linux-android- --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-arm64 --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=aarch64 --target-os=linux --enable-cross-compile --cross-prefix=../../prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin/aarch64-linux-android- --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-arm64 --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 diff --git a/android/include/config-silvermont.h b/android/include/config-silvermont.h index 28f1b5a761..e745f9dc64 100644 --- a/android/include/config-silvermont.h +++ b/android/include/config-silvermont.h @@ -1,7 +1,7 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H -#define FFMPEG_CONFIGURATION "--arch=x86 --cpu=silvermont --build_suffix= --cross-prefix=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android- --enable-cross-compile --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-x86 --target-os=linux --extra-cflags=-m32 --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=x86 --cpu=silvermont --build_suffix= --cross-prefix=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android- --enable-cross-compile --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-x86 --target-os=linux --extra-cflags=-m32 --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 diff --git a/android/include/config-x86.h b/android/include/config-x86.h index 236464e605..f3d450949b 100644 --- a/android/include/config-x86.h +++ b/android/include/config-x86.h @@ -1,7 +1,7 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H -#define FFMPEG_CONFIGURATION "--arch=x86 --cpu=i686 --build_suffix= --cross-prefix=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android- --enable-cross-compile --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-x86 --target-os=linux --extra-cflags=-m32 --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=x86 --cpu=i686 --build_suffix= --cross-prefix=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android- --enable-cross-compile --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-x86 --target-os=linux --extra-cflags=-m32 --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 diff --git a/android/include/config.asm b/android/include/config.asm index 77a1861e15..b4b332f415 100644 --- a/android/include/config.asm +++ b/android/include/config.asm @@ -56,6 +56,7 @@ %define HAVE_I686 1 %define HAVE_MIPSFPU 0 %define HAVE_MIPS32R2 0 +%define HAVE_MIPS32R5 0 %define HAVE_MIPS64R2 0 %define HAVE_MIPS32R6 0 %define HAVE_MIPS64R6 0 @@ -99,6 +100,7 @@ %define HAVE_I686_EXTERNAL 0 %define HAVE_MIPSFPU_EXTERNAL 0 %define HAVE_MIPS32R2_EXTERNAL 0 +%define HAVE_MIPS32R5_EXTERNAL 0 %define HAVE_MIPS64R2_EXTERNAL 0 %define HAVE_MIPS32R6_EXTERNAL 0 %define HAVE_MIPS64R6_EXTERNAL 0 @@ -142,6 +144,7 @@ %define HAVE_I686_INLINE 0 %define HAVE_MIPSFPU_INLINE 0 %define HAVE_MIPS32R2_INLINE 0 +%define HAVE_MIPS32R5_INLINE 0 %define HAVE_MIPS64R2_INLINE 0 %define HAVE_MIPS32R6_INLINE 0 %define HAVE_MIPS64R6_INLINE 0 @@ -377,8 +380,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 diff --git a/gen-android-configs b/gen-android-configs index 6f1da875f1..4b66c4d40a 100755 --- a/gen-android-configs +++ b/gen-android-configs @@ -5,7 +5,7 @@ TARGETS="armv5te armv7-a armv7-a-neon armv8-a silvermont x86" SYSROOT_BASE="../../prebuilts/ndk/current/platforms/android-21" TOOLS_BASE="../../prebuilts/gcc/linux-x86" -BASE_CONFIG="--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" +BASE_CONFIG="--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" OPTS_armv5te="--arch=arm --cpu=armv5te --build_suffix= --cross-prefix=${TOOLS_BASE}/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi- --enable-cross-compile --sysroot=${SYSROOT_BASE}/arch-arm --target-os=linux" |