7 files changed, 95 insertions, 20 deletions
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