API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Jan 23rd, 2017
98
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 75.85 KB | None | 0 0
raw download clone embed print report
  1. From 6fe9aa5486ac0182986d538b0ca85cd9f9d53e2d Mon Sep 17 00:00:00 2001
  2. From: Luca Stefani <luca.stefani.ge1@gmail.com>
  3. Date: Mon, 23 Jan 2017 19:00:25 +0100
  4. Subject: [PATCH] android: Regen configs
  5.  
  6. * Set sysroot to android-24
  7. * Disable unneeded docs
  8.  
  9. Change-Id: I77a8fd84c32c44b595cd98adccc497f1333fc447
  10. ---
  11. android/config-armv5te.mak | 24 ++++++++++++++----------
  12. android/config-armv7-a-neon.mak | 24 ++++++++++++++----------
  13. android/config-armv7-a.mak | 24 ++++++++++++++----------
  14. android/config-armv8-a.mak | 24 ++++++++++++++----------
  15. android/config-silvermont.mak | 26 +++++++++++++++-----------
  16. android/config-x86.mak | 29 +++++++++++++++++------------
  17. android/include/config-armv5te.h | 28 ++++++++++++++++++++++------
  18. android/include/config-armv7-a-neon.h | 28 ++++++++++++++++++++++------
  19. android/include/config-armv7-a.h | 28 ++++++++++++++++++++++------
  20. android/include/config-armv8-a.h | 28 ++++++++++++++++++++++------
  21. android/include/config-silvermont.h | 28 ++++++++++++++++++++++------
  22. android/include/config-x86.h | 28 ++++++++++++++++++++++------
  23. android/include/config.asm | 12 ++++++++----
  24. gen-android-configs | 4 ++--
  25. 14 files changed, 230 insertions(+), 105 deletions(-)
  26.  
  27. diff --git a/android/config-armv5te.mak b/android/config-armv5te.mak
  28. index fbb57ee4bc..276090a3c0 100644
  29. --- a/android/config-armv5te.mak
  30. +++ b/android/config-armv5te.mak
  31. @@ -1,7 +1,7 @@
  32. # Automatically generated by configure - do not modify!
  33. ifndef FFMPEG_CONFIG_MAK
  34. FFMPEG_CONFIG_MAK=1
  35. -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
  36. +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-24/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
  37. prefix=/usr/local
  38. LIBDIR=$(DESTDIR)${prefix}/lib
  39. SHLIBDIR=$(DESTDIR)${prefix}/lib
  40. @@ -16,7 +16,7 @@ SRC_LINK=.
  41. ifndef MAIN_MAKEFILE
  42. SRC_PATH:=$(SRC_PATH:.%=..%)
  43. endif
  44. -CC_IDENT=gcc 4.9.x-google (GCC) 20140827 (prerelease)
  45. +CC_IDENT=gcc 4.9 (GCC) 20150123 (prerelease)
  46. ARCH=arm
  47. INTRINSICS=none
  48. CC=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-gcc
  49. @@ -37,10 +37,10 @@ RANLIB=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux
  50. STRIP=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-strip
  51. CP=cp -p
  52. LN_S=ln -s -f
  53. -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
  54. +CPPFLAGS= --sysroot=../../prebuilts/ndk/current/platforms/android-24/arch-arm -isysroot ../../prebuilts/ndk/current/platforms/android-24/arch-arm -D_ISOC99_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Dstrtod=avpriv_strtod -DPIC -DZLIB_CONST
  55. 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
  56. CXXFLAGS= -D__STDC_CONSTANT_MACROS
  57. -OBJCFLAGS=
  58. +OBJCFLAGS=
  59. ASFLAGS= -march=armv5te -fPIC
  60. AS_C=-c
  61. AS_O=-o $@
  62. @@ -59,7 +59,7 @@ DLLTOOL=
  63. WINDRES=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-windres
  64. DEPWINDRES=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-gcc
  65. DOXYGEN=doxygen
  66. -LDFLAGS= --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-arm -isysroot ../../prebuilts/ndk/current/platforms/android-21/arch-arm -march=armv5te -Wl,--as-needed -Wl,-z,noexecstack -Wl,--warn-common -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample
  67. +LDFLAGS= --sysroot=../../prebuilts/ndk/current/platforms/android-24/arch-arm -isysroot ../../prebuilts/ndk/current/platforms/android-24/arch-arm -march=armv5te -Wl,--as-needed -Wl,-z,noexecstack -Wl,--warn-common -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample
  68. LDEXEFLAGS=
  69. LDLIBFLAGS=
  70. SHFLAGS=-shared -Wl,-soname,$$(@F) -Wl,-Bsymbolic -Wl,--version-script,$(SUBDIR)lib$(NAME).ver
  71. @@ -97,7 +97,7 @@ HOSTCC_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@
  72. HOSTCC_C=-c
  73. HOSTCC_O=-o $@
  74. HOSTLD_O=-o $@
  75. -TARGET_EXEC=
  76. +TARGET_EXEC=
  77. TARGET_PATH=$(CURDIR)
  78. TARGET_SAMPLES=$(SAMPLES)
  79. CFLAGS-ffplay=
  80. @@ -217,6 +217,7 @@ HAVE_SETEND=yes
  81. !HAVE_I686=yes
  82. !HAVE_MIPSFPU=yes
  83. !HAVE_MIPS32R2=yes
  84. +!HAVE_MIPS32R5=yes
  85. !HAVE_MIPS64R2=yes
  86. !HAVE_MIPS32R6=yes
  87. !HAVE_MIPS64R6=yes
  88. @@ -260,6 +261,7 @@ HAVE_VFP_EXTERNAL=yes
  89. !HAVE_I686_EXTERNAL=yes
  90. !HAVE_MIPSFPU_EXTERNAL=yes
  91. !HAVE_MIPS32R2_EXTERNAL=yes
  92. +!HAVE_MIPS32R5_EXTERNAL=yes
  93. !HAVE_MIPS64R2_EXTERNAL=yes
  94. !HAVE_MIPS32R6_EXTERNAL=yes
  95. !HAVE_MIPS64R6_EXTERNAL=yes
  96. @@ -303,6 +305,7 @@ HAVE_ARMV5TE_INLINE=yes
  97. !HAVE_I686_INLINE=yes
  98. !HAVE_MIPSFPU_INLINE=yes
  99. !HAVE_MIPS32R2_INLINE=yes
  100. +!HAVE_MIPS32R5_INLINE=yes
  101. !HAVE_MIPS64R2_INLINE=yes
  102. !HAVE_MIPS32R6_INLINE=yes
  103. !HAVE_MIPS64R6_INLINE=yes
  104. @@ -458,6 +461,7 @@ HAVE_POSIX_MEMALIGN=yes
  105. HAVE_SCHED_GETAFFINITY=yes
  106. !HAVE_SETCONSOLETEXTATTRIBUTE=yes
  107. !HAVE_SETCONSOLECTRLHANDLER=yes
  108. +!HAVE_SETDLLDIRECTORY=yes
  109. !HAVE_SETMODE=yes
  110. HAVE_SETRLIMIT=yes
  111. !HAVE_SLEEP=yes
  112. @@ -513,8 +517,8 @@ HAVE_ATOMICS_NATIVE=yes
  113. !HAVE_LIBC_MSVCRT=yes
  114. !HAVE_LIBDC1394_1=yes
  115. !HAVE_LIBDC1394_2=yes
  116. -!HAVE_MAKEINFO=yes
  117. -!HAVE_MAKEINFO_HTML=yes
  118. +HAVE_MAKEINFO=yes
  119. +HAVE_MAKEINFO_HTML=yes
  120. HAVE_PERL=yes
  121. HAVE_POD2MAN=yes
  122. !HAVE_SDL=yes
  123. @@ -538,8 +542,8 @@ CONFIG_MUXERS=yes
  124. CONFIG_PROTOCOLS=yes
  125. !CONFIG_DOC=yes
  126. !CONFIG_HTMLPAGES=yes
  127. -CONFIG_MANPAGES=yes
  128. -CONFIG_PODPAGES=yes
  129. +!CONFIG_MANPAGES=yes
  130. +!CONFIG_PODPAGES=yes
  131. !CONFIG_TXTPAGES=yes
  132. CONFIG_AVIO_READING_EXAMPLE=yes
  133. CONFIG_AVIO_DIR_CMD_EXAMPLE=yes
  134. diff --git a/android/config-armv7-a-neon.mak b/android/config-armv7-a-neon.mak
  135. index 2e458b3fb7..fb11eaccd8 100644
  136. --- a/android/config-armv7-a-neon.mak
  137. +++ b/android/config-armv7-a-neon.mak
  138. @@ -1,7 +1,7 @@
  139. # Automatically generated by configure - do not modify!
  140. ifndef FFMPEG_CONFIG_MAK
  141. FFMPEG_CONFIG_MAK=1
  142. -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
  143. +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-24/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
  144. prefix=/usr/local
  145. LIBDIR=$(DESTDIR)${prefix}/lib
  146. SHLIBDIR=$(DESTDIR)${prefix}/lib
  147. @@ -16,7 +16,7 @@ SRC_LINK=.
  148. ifndef MAIN_MAKEFILE
  149. SRC_PATH:=$(SRC_PATH:.%=..%)
  150. endif
  151. -CC_IDENT=gcc 4.9.x-google (GCC) 20140827 (prerelease)
  152. +CC_IDENT=gcc 4.9 (GCC) 20150123 (prerelease)
  153. ARCH=arm
  154. INTRINSICS=none
  155. CC=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-gcc
  156. @@ -37,10 +37,10 @@ RANLIB=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux
  157. STRIP=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-strip
  158. CP=cp -p
  159. LN_S=ln -s -f
  160. -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
  161. +CPPFLAGS= --sysroot=../../prebuilts/ndk/current/platforms/android-24/arch-arm -isysroot ../../prebuilts/ndk/current/platforms/android-24/arch-arm -D_ISOC99_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Dstrtod=avpriv_strtod -DPIC -DZLIB_CONST
  162. 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
  163. CXXFLAGS= -D__STDC_CONSTANT_MACROS
  164. -OBJCFLAGS=
  165. +OBJCFLAGS=
  166. ASFLAGS= -march=armv7-a -fPIC
  167. AS_C=-c
  168. AS_O=-o $@
  169. @@ -59,7 +59,7 @@ DLLTOOL=
  170. WINDRES=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-windres
  171. DEPWINDRES=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-gcc
  172. DOXYGEN=doxygen
  173. -LDFLAGS= --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-arm -isysroot ../../prebuilts/ndk/current/platforms/android-21/arch-arm -march=armv7-a -Wl,--as-needed -Wl,-z,noexecstack -Wl,--warn-common -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample
  174. +LDFLAGS= --sysroot=../../prebuilts/ndk/current/platforms/android-24/arch-arm -isysroot ../../prebuilts/ndk/current/platforms/android-24/arch-arm -march=armv7-a -Wl,--as-needed -Wl,-z,noexecstack -Wl,--warn-common -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample
  175. LDEXEFLAGS=
  176. LDLIBFLAGS=
  177. SHFLAGS=-shared -Wl,-soname,$$(@F) -Wl,-Bsymbolic -Wl,--version-script,$(SUBDIR)lib$(NAME).ver
  178. @@ -97,7 +97,7 @@ HOSTCC_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@
  179. HOSTCC_C=-c
  180. HOSTCC_O=-o $@
  181. HOSTLD_O=-o $@
  182. -TARGET_EXEC=
  183. +TARGET_EXEC=
  184. TARGET_PATH=$(CURDIR)
  185. TARGET_SAMPLES=$(SAMPLES)
  186. CFLAGS-ffplay=
  187. @@ -217,6 +217,7 @@ HAVE_SETEND=yes
  188. !HAVE_I686=yes
  189. !HAVE_MIPSFPU=yes
  190. !HAVE_MIPS32R2=yes
  191. +!HAVE_MIPS32R5=yes
  192. !HAVE_MIPS64R2=yes
  193. !HAVE_MIPS32R6=yes
  194. !HAVE_MIPS64R6=yes
  195. @@ -260,6 +261,7 @@ HAVE_SETEND_EXTERNAL=yes
  196. !HAVE_I686_EXTERNAL=yes
  197. !HAVE_MIPSFPU_EXTERNAL=yes
  198. !HAVE_MIPS32R2_EXTERNAL=yes
  199. +!HAVE_MIPS32R5_EXTERNAL=yes
  200. !HAVE_MIPS64R2_EXTERNAL=yes
  201. !HAVE_MIPS32R6_EXTERNAL=yes
  202. !HAVE_MIPS64R6_EXTERNAL=yes
  203. @@ -303,6 +305,7 @@ HAVE_SETEND_INLINE=yes
  204. !HAVE_I686_INLINE=yes
  205. !HAVE_MIPSFPU_INLINE=yes
  206. !HAVE_MIPS32R2_INLINE=yes
  207. +!HAVE_MIPS32R5_INLINE=yes
  208. !HAVE_MIPS64R2_INLINE=yes
  209. !HAVE_MIPS32R6_INLINE=yes
  210. !HAVE_MIPS64R6_INLINE=yes
  211. @@ -458,6 +461,7 @@ HAVE_POSIX_MEMALIGN=yes
  212. HAVE_SCHED_GETAFFINITY=yes
  213. !HAVE_SETCONSOLETEXTATTRIBUTE=yes
  214. !HAVE_SETCONSOLECTRLHANDLER=yes
  215. +!HAVE_SETDLLDIRECTORY=yes
  216. !HAVE_SETMODE=yes
  217. HAVE_SETRLIMIT=yes
  218. !HAVE_SLEEP=yes
  219. @@ -513,8 +517,8 @@ HAVE_ATOMICS_NATIVE=yes
  220. !HAVE_LIBC_MSVCRT=yes
  221. !HAVE_LIBDC1394_1=yes
  222. !HAVE_LIBDC1394_2=yes
  223. -!HAVE_MAKEINFO=yes
  224. -!HAVE_MAKEINFO_HTML=yes
  225. +HAVE_MAKEINFO=yes
  226. +HAVE_MAKEINFO_HTML=yes
  227. HAVE_PERL=yes
  228. HAVE_POD2MAN=yes
  229. !HAVE_SDL=yes
  230. @@ -538,8 +542,8 @@ CONFIG_MUXERS=yes
  231. CONFIG_PROTOCOLS=yes
  232. !CONFIG_DOC=yes
  233. !CONFIG_HTMLPAGES=yes
  234. -CONFIG_MANPAGES=yes
  235. -CONFIG_PODPAGES=yes
  236. +!CONFIG_MANPAGES=yes
  237. +!CONFIG_PODPAGES=yes
  238. !CONFIG_TXTPAGES=yes
  239. CONFIG_AVIO_READING_EXAMPLE=yes
  240. CONFIG_AVIO_DIR_CMD_EXAMPLE=yes
  241. diff --git a/android/config-armv7-a.mak b/android/config-armv7-a.mak
  242. index 9939b7f62b..a03c302b5b 100644
  243. --- a/android/config-armv7-a.mak
  244. +++ b/android/config-armv7-a.mak
  245. @@ -1,7 +1,7 @@
  246. # Automatically generated by configure - do not modify!
  247. ifndef FFMPEG_CONFIG_MAK
  248. FFMPEG_CONFIG_MAK=1
  249. -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
  250. +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-24/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
  251. prefix=/usr/local
  252. LIBDIR=$(DESTDIR)${prefix}/lib
  253. SHLIBDIR=$(DESTDIR)${prefix}/lib
  254. @@ -16,7 +16,7 @@ SRC_LINK=.
  255. ifndef MAIN_MAKEFILE
  256. SRC_PATH:=$(SRC_PATH:.%=..%)
  257. endif
  258. -CC_IDENT=gcc 4.9.x-google (GCC) 20140827 (prerelease)
  259. +CC_IDENT=gcc 4.9 (GCC) 20150123 (prerelease)
  260. ARCH=arm
  261. INTRINSICS=none
  262. CC=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-gcc
  263. @@ -37,10 +37,10 @@ RANLIB=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux
  264. STRIP=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-strip
  265. CP=cp -p
  266. LN_S=ln -s -f
  267. -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
  268. +CPPFLAGS= --sysroot=../../prebuilts/ndk/current/platforms/android-24/arch-arm -isysroot ../../prebuilts/ndk/current/platforms/android-24/arch-arm -D_ISOC99_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Dstrtod=avpriv_strtod -DPIC -DZLIB_CONST
  269. 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
  270. CXXFLAGS= -D__STDC_CONSTANT_MACROS
  271. -OBJCFLAGS=
  272. +OBJCFLAGS=
  273. ASFLAGS= -march=armv7-a -fPIC
  274. AS_C=-c
  275. AS_O=-o $@
  276. @@ -59,7 +59,7 @@ DLLTOOL=
  277. WINDRES=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-windres
  278. DEPWINDRES=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-gcc
  279. DOXYGEN=doxygen
  280. -LDFLAGS= --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-arm -isysroot ../../prebuilts/ndk/current/platforms/android-21/arch-arm -march=armv7-a -Wl,--as-needed -Wl,-z,noexecstack -Wl,--warn-common -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample
  281. +LDFLAGS= --sysroot=../../prebuilts/ndk/current/platforms/android-24/arch-arm -isysroot ../../prebuilts/ndk/current/platforms/android-24/arch-arm -march=armv7-a -Wl,--as-needed -Wl,-z,noexecstack -Wl,--warn-common -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample
  282. LDEXEFLAGS=
  283. LDLIBFLAGS=
  284. SHFLAGS=-shared -Wl,-soname,$$(@F) -Wl,-Bsymbolic -Wl,--version-script,$(SUBDIR)lib$(NAME).ver
  285. @@ -97,7 +97,7 @@ HOSTCC_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@
  286. HOSTCC_C=-c
  287. HOSTCC_O=-o $@
  288. HOSTLD_O=-o $@
  289. -TARGET_EXEC=
  290. +TARGET_EXEC=
  291. TARGET_PATH=$(CURDIR)
  292. TARGET_SAMPLES=$(SAMPLES)
  293. CFLAGS-ffplay=
  294. @@ -217,6 +217,7 @@ HAVE_SETEND=yes
  295. !HAVE_I686=yes
  296. !HAVE_MIPSFPU=yes
  297. !HAVE_MIPS32R2=yes
  298. +!HAVE_MIPS32R5=yes
  299. !HAVE_MIPS64R2=yes
  300. !HAVE_MIPS32R6=yes
  301. !HAVE_MIPS64R6=yes
  302. @@ -260,6 +261,7 @@ HAVE_SETEND_EXTERNAL=yes
  303. !HAVE_I686_EXTERNAL=yes
  304. !HAVE_MIPSFPU_EXTERNAL=yes
  305. !HAVE_MIPS32R2_EXTERNAL=yes
  306. +!HAVE_MIPS32R5_EXTERNAL=yes
  307. !HAVE_MIPS64R2_EXTERNAL=yes
  308. !HAVE_MIPS32R6_EXTERNAL=yes
  309. !HAVE_MIPS64R6_EXTERNAL=yes
  310. @@ -303,6 +305,7 @@ HAVE_SETEND_INLINE=yes
  311. !HAVE_I686_INLINE=yes
  312. !HAVE_MIPSFPU_INLINE=yes
  313. !HAVE_MIPS32R2_INLINE=yes
  314. +!HAVE_MIPS32R5_INLINE=yes
  315. !HAVE_MIPS64R2_INLINE=yes
  316. !HAVE_MIPS32R6_INLINE=yes
  317. !HAVE_MIPS64R6_INLINE=yes
  318. @@ -458,6 +461,7 @@ HAVE_POSIX_MEMALIGN=yes
  319. HAVE_SCHED_GETAFFINITY=yes
  320. !HAVE_SETCONSOLETEXTATTRIBUTE=yes
  321. !HAVE_SETCONSOLECTRLHANDLER=yes
  322. +!HAVE_SETDLLDIRECTORY=yes
  323. !HAVE_SETMODE=yes
  324. HAVE_SETRLIMIT=yes
  325. !HAVE_SLEEP=yes
  326. @@ -513,8 +517,8 @@ HAVE_ATOMICS_NATIVE=yes
  327. !HAVE_LIBC_MSVCRT=yes
  328. !HAVE_LIBDC1394_1=yes
  329. !HAVE_LIBDC1394_2=yes
  330. -!HAVE_MAKEINFO=yes
  331. -!HAVE_MAKEINFO_HTML=yes
  332. +HAVE_MAKEINFO=yes
  333. +HAVE_MAKEINFO_HTML=yes
  334. HAVE_PERL=yes
  335. HAVE_POD2MAN=yes
  336. !HAVE_SDL=yes
  337. @@ -538,8 +542,8 @@ CONFIG_MUXERS=yes
  338. CONFIG_PROTOCOLS=yes
  339. !CONFIG_DOC=yes
  340. !CONFIG_HTMLPAGES=yes
  341. -CONFIG_MANPAGES=yes
  342. -CONFIG_PODPAGES=yes
  343. +!CONFIG_MANPAGES=yes
  344. +!CONFIG_PODPAGES=yes
  345. !CONFIG_TXTPAGES=yes
  346. CONFIG_AVIO_READING_EXAMPLE=yes
  347. CONFIG_AVIO_DIR_CMD_EXAMPLE=yes
  348. diff --git a/android/config-armv8-a.mak b/android/config-armv8-a.mak
  349. index 5eb69cd9b6..ee02a58f87 100644
  350. --- a/android/config-armv8-a.mak
  351. +++ b/android/config-armv8-a.mak
  352. @@ -1,7 +1,7 @@
  353. # Automatically generated by configure - do not modify!
  354. ifndef FFMPEG_CONFIG_MAK
  355. FFMPEG_CONFIG_MAK=1
  356. -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
  357. +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-24/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
  358. prefix=/usr/local
  359. LIBDIR=$(DESTDIR)${prefix}/lib
  360. SHLIBDIR=$(DESTDIR)${prefix}/lib
  361. @@ -16,7 +16,7 @@ SRC_LINK=.
  362. ifndef MAIN_MAKEFILE
  363. SRC_PATH:=$(SRC_PATH:.%=..%)
  364. endif
  365. -CC_IDENT=gcc 4.9.x-google (GCC) 20140827 (prerelease)
  366. +CC_IDENT=gcc 4.9 (GCC) 20150123 (prerelease)
  367. ARCH=aarch64
  368. INTRINSICS=neon
  369. CC=../../prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin/aarch64-linux-android-gcc
  370. @@ -37,10 +37,10 @@ RANLIB=../../prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin/aarch
  371. STRIP=../../prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin/aarch64-linux-android-strip
  372. CP=cp -p
  373. LN_S=ln -s -f
  374. -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
  375. +CPPFLAGS= --sysroot=../../prebuilts/ndk/current/platforms/android-24/arch-arm64 -isysroot ../../prebuilts/ndk/current/platforms/android-24/arch-arm64 -D_ISOC99_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Dstrtod=avpriv_strtod -DPIC -DZLIB_CONST
  376. 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
  377. CXXFLAGS= -D__STDC_CONSTANT_MACROS
  378. -OBJCFLAGS=
  379. +OBJCFLAGS=
  380. ASFLAGS= -fPIC
  381. AS_C=-c
  382. AS_O=-o $@
  383. @@ -59,7 +59,7 @@ DLLTOOL=
  384. WINDRES=../../prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin/aarch64-linux-android-windres
  385. DEPWINDRES=../../prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin/aarch64-linux-android-gcc
  386. DOXYGEN=doxygen
  387. -LDFLAGS= --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-arm64 -isysroot ../../prebuilts/ndk/current/platforms/android-21/arch-arm64 -Wl,--as-needed -Wl,-z,noexecstack -Wl,--warn-common -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample
  388. +LDFLAGS= --sysroot=../../prebuilts/ndk/current/platforms/android-24/arch-arm64 -isysroot ../../prebuilts/ndk/current/platforms/android-24/arch-arm64 -Wl,--as-needed -Wl,-z,noexecstack -Wl,--warn-common -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample
  389. LDEXEFLAGS=
  390. LDLIBFLAGS=
  391. SHFLAGS=-shared -Wl,-soname,$$(@F) -Wl,-Bsymbolic -Wl,--version-script,$(SUBDIR)lib$(NAME).ver
  392. @@ -97,7 +97,7 @@ HOSTCC_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@
  393. HOSTCC_C=-c
  394. HOSTCC_O=-o $@
  395. HOSTLD_O=-o $@
  396. -TARGET_EXEC=
  397. +TARGET_EXEC=
  398. TARGET_PATH=$(CURDIR)
  399. TARGET_SAMPLES=$(SAMPLES)
  400. CFLAGS-ffplay=
  401. @@ -217,6 +217,7 @@ HAVE_VFP=yes
  402. !HAVE_I686=yes
  403. !HAVE_MIPSFPU=yes
  404. !HAVE_MIPS32R2=yes
  405. +!HAVE_MIPS32R5=yes
  406. !HAVE_MIPS64R2=yes
  407. !HAVE_MIPS32R6=yes
  408. !HAVE_MIPS64R6=yes
  409. @@ -260,6 +261,7 @@ HAVE_VFP_EXTERNAL=yes
  410. !HAVE_I686_EXTERNAL=yes
  411. !HAVE_MIPSFPU_EXTERNAL=yes
  412. !HAVE_MIPS32R2_EXTERNAL=yes
  413. +!HAVE_MIPS32R5_EXTERNAL=yes
  414. !HAVE_MIPS64R2_EXTERNAL=yes
  415. !HAVE_MIPS32R6_EXTERNAL=yes
  416. !HAVE_MIPS64R6_EXTERNAL=yes
  417. @@ -303,6 +305,7 @@ HAVE_VFP_INLINE=yes
  418. !HAVE_I686_INLINE=yes
  419. !HAVE_MIPSFPU_INLINE=yes
  420. !HAVE_MIPS32R2_INLINE=yes
  421. +!HAVE_MIPS32R5_INLINE=yes
  422. !HAVE_MIPS64R2_INLINE=yes
  423. !HAVE_MIPS32R6_INLINE=yes
  424. !HAVE_MIPS64R6_INLINE=yes
  425. @@ -458,6 +461,7 @@ HAVE_POSIX_MEMALIGN=yes
  426. HAVE_SCHED_GETAFFINITY=yes
  427. !HAVE_SETCONSOLETEXTATTRIBUTE=yes
  428. !HAVE_SETCONSOLECTRLHANDLER=yes
  429. +!HAVE_SETDLLDIRECTORY=yes
  430. !HAVE_SETMODE=yes
  431. HAVE_SETRLIMIT=yes
  432. !HAVE_SLEEP=yes
  433. @@ -513,8 +517,8 @@ HAVE_ATOMICS_NATIVE=yes
  434. !HAVE_LIBC_MSVCRT=yes
  435. !HAVE_LIBDC1394_1=yes
  436. !HAVE_LIBDC1394_2=yes
  437. -!HAVE_MAKEINFO=yes
  438. -!HAVE_MAKEINFO_HTML=yes
  439. +HAVE_MAKEINFO=yes
  440. +HAVE_MAKEINFO_HTML=yes
  441. HAVE_PERL=yes
  442. HAVE_POD2MAN=yes
  443. !HAVE_SDL=yes
  444. @@ -538,8 +542,8 @@ CONFIG_MUXERS=yes
  445. CONFIG_PROTOCOLS=yes
  446. !CONFIG_DOC=yes
  447. !CONFIG_HTMLPAGES=yes
  448. -CONFIG_MANPAGES=yes
  449. -CONFIG_PODPAGES=yes
  450. +!CONFIG_MANPAGES=yes
  451. +!CONFIG_PODPAGES=yes
  452. !CONFIG_TXTPAGES=yes
  453. CONFIG_AVIO_READING_EXAMPLE=yes
  454. CONFIG_AVIO_DIR_CMD_EXAMPLE=yes
  455. diff --git a/android/config-silvermont.mak b/android/config-silvermont.mak
  456. index 202df40c0a..ee8fe9b36c 100644
  457. --- a/android/config-silvermont.mak
  458. +++ b/android/config-silvermont.mak
  459. @@ -1,7 +1,7 @@
  460. # Automatically generated by configure - do not modify!
  461. ifndef FFMPEG_CONFIG_MAK
  462. FFMPEG_CONFIG_MAK=1
  463. -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
  464. +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-24/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
  465. prefix=/usr/local
  466. LIBDIR=$(DESTDIR)${prefix}/lib
  467. SHLIBDIR=$(DESTDIR)${prefix}/lib
  468. @@ -16,7 +16,7 @@ SRC_LINK=.
  469. ifndef MAIN_MAKEFILE
  470. SRC_PATH:=$(SRC_PATH:.%=..%)
  471. endif
  472. -CC_IDENT=gcc 4.9 (GCC) 20140827 (prerelease)
  473. +CC_IDENT=gcc 4.9 (GCC) 20150123 (prerelease)
  474. ARCH=x86
  475. INTRINSICS=none
  476. CC=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android-gcc
  477. @@ -37,10 +37,10 @@ RANLIB=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-lin
  478. STRIP=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android-strip
  479. CP=cp -p
  480. LN_S=ln -s -f
  481. -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
  482. -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
  483. +CPPFLAGS= --sysroot=../../prebuilts/ndk/current/platforms/android-24/arch-x86 -isysroot ../../prebuilts/ndk/current/platforms/android-24/arch-x86 -D_ISOC99_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Dstrtod=avpriv_strtod -DPIC -DZLIB_CONST
  484. +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
  485. CXXFLAGS= -D__STDC_CONSTANT_MACROS
  486. -OBJCFLAGS=
  487. +OBJCFLAGS=
  488. ASFLAGS= -m32 -march=silvermont -fPIC
  489. AS_C=-c
  490. AS_O=-o $@
  491. @@ -59,7 +59,7 @@ DLLTOOL=
  492. WINDRES=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android-windres
  493. DEPWINDRES=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android-gcc
  494. DOXYGEN=doxygen
  495. -LDFLAGS= --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-x86 -isysroot ../../prebuilts/ndk/current/platforms/android-21/arch-x86 -march=silvermont -Wl,--as-needed -Wl,-z,noexecstack -Wl,--warn-common -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample
  496. +LDFLAGS= --sysroot=../../prebuilts/ndk/current/platforms/android-24/arch-x86 -isysroot ../../prebuilts/ndk/current/platforms/android-24/arch-x86 -march=silvermont -Wl,--as-needed -Wl,-z,noexecstack -Wl,--warn-common -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample
  497. LDEXEFLAGS=
  498. LDLIBFLAGS=
  499. SHFLAGS=-shared -Wl,-soname,$$(@F) -Wl,-Bsymbolic -Wl,--version-script,$(SUBDIR)lib$(NAME).ver
  500. @@ -97,7 +97,7 @@ HOSTCC_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@
  501. HOSTCC_C=-c
  502. HOSTCC_O=-o $@
  503. HOSTLD_O=-o $@
  504. -TARGET_EXEC=
  505. +TARGET_EXEC=
  506. TARGET_PATH=$(CURDIR)
  507. TARGET_SAMPLES=$(SAMPLES)
  508. CFLAGS-ffplay=
  509. @@ -217,6 +217,7 @@ HAVE_CPUNOP=yes
  510. HAVE_I686=yes
  511. !HAVE_MIPSFPU=yes
  512. !HAVE_MIPS32R2=yes
  513. +!HAVE_MIPS32R5=yes
  514. !HAVE_MIPS64R2=yes
  515. !HAVE_MIPS32R6=yes
  516. !HAVE_MIPS64R6=yes
  517. @@ -260,6 +261,7 @@ HAVE_XOP_EXTERNAL=yes
  518. !HAVE_I686_EXTERNAL=yes
  519. !HAVE_MIPSFPU_EXTERNAL=yes
  520. !HAVE_MIPS32R2_EXTERNAL=yes
  521. +!HAVE_MIPS32R5_EXTERNAL=yes
  522. !HAVE_MIPS64R2_EXTERNAL=yes
  523. !HAVE_MIPS32R6_EXTERNAL=yes
  524. !HAVE_MIPS64R6_EXTERNAL=yes
  525. @@ -303,6 +305,7 @@ HAVE_XOP_INLINE=yes
  526. !HAVE_I686_INLINE=yes
  527. !HAVE_MIPSFPU_INLINE=yes
  528. !HAVE_MIPS32R2_INLINE=yes
  529. +!HAVE_MIPS32R5_INLINE=yes
  530. !HAVE_MIPS64R2_INLINE=yes
  531. !HAVE_MIPS32R6_INLINE=yes
  532. !HAVE_MIPS64R6_INLINE=yes
  533. @@ -458,6 +461,7 @@ HAVE_POSIX_MEMALIGN=yes
  534. HAVE_SCHED_GETAFFINITY=yes
  535. !HAVE_SETCONSOLETEXTATTRIBUTE=yes
  536. !HAVE_SETCONSOLECTRLHANDLER=yes
  537. +!HAVE_SETDLLDIRECTORY=yes
  538. !HAVE_SETMODE=yes
  539. HAVE_SETRLIMIT=yes
  540. !HAVE_SLEEP=yes
  541. @@ -513,8 +517,8 @@ HAVE_ATOMICS_NATIVE=yes
  542. !HAVE_LIBC_MSVCRT=yes
  543. !HAVE_LIBDC1394_1=yes
  544. !HAVE_LIBDC1394_2=yes
  545. -!HAVE_MAKEINFO=yes
  546. -!HAVE_MAKEINFO_HTML=yes
  547. +HAVE_MAKEINFO=yes
  548. +HAVE_MAKEINFO_HTML=yes
  549. HAVE_PERL=yes
  550. HAVE_POD2MAN=yes
  551. !HAVE_SDL=yes
  552. @@ -538,8 +542,8 @@ CONFIG_MUXERS=yes
  553. CONFIG_PROTOCOLS=yes
  554. !CONFIG_DOC=yes
  555. !CONFIG_HTMLPAGES=yes
  556. -CONFIG_MANPAGES=yes
  557. -CONFIG_PODPAGES=yes
  558. +!CONFIG_MANPAGES=yes
  559. +!CONFIG_PODPAGES=yes
  560. !CONFIG_TXTPAGES=yes
  561. CONFIG_AVIO_READING_EXAMPLE=yes
  562. CONFIG_AVIO_DIR_CMD_EXAMPLE=yes
  563. diff --git a/android/config-x86.mak b/android/config-x86.mak
  564. index 2d7c14a06f..fcd97d6fe8 100644
  565. --- a/android/config-x86.mak
  566. +++ b/android/config-x86.mak
  567. @@ -1,7 +1,7 @@
  568. # Automatically generated by configure - do not modify!
  569. ifndef FFMPEG_CONFIG_MAK
  570. FFMPEG_CONFIG_MAK=1
  571. -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
  572. +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-24/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
  573. prefix=/usr/local
  574. LIBDIR=$(DESTDIR)${prefix}/lib
  575. SHLIBDIR=$(DESTDIR)${prefix}/lib
  576. @@ -16,7 +16,7 @@ SRC_LINK=.
  577. ifndef MAIN_MAKEFILE
  578. SRC_PATH:=$(SRC_PATH:.%=..%)
  579. endif
  580. -CC_IDENT=gcc 4.9 (GCC) 20140827 (prerelease)
  581. +CC_IDENT=gcc 4.9 (GCC) 20150123 (prerelease)
  582. ARCH=x86
  583. INTRINSICS=none
  584. CC=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android-gcc
  585. @@ -28,7 +28,8 @@ DEPCC=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linu
  586. DEPCCFLAGS= $(CPPFLAGS)
  587. DEPAS=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android-gcc
  588. DEPASFLAGS= $(CPPFLAGS)
  589. -DEPYASM=$(YASM)
  590. +YASM=yasm
  591. +DEPYASM=yasm
  592. AR=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android-ar
  593. ARFLAGS=rcD
  594. AR_O=$@
  595. @@ -36,10 +37,10 @@ RANLIB=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-lin
  596. STRIP=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android-strip
  597. CP=cp -p
  598. LN_S=ln -s -f
  599. -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
  600. -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
  601. +CPPFLAGS= --sysroot=../../prebuilts/ndk/current/platforms/android-24/arch-x86 -isysroot ../../prebuilts/ndk/current/platforms/android-24/arch-x86 -D_ISOC99_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Dstrtod=avpriv_strtod -DPIC -DZLIB_CONST
  602. +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
  603. CXXFLAGS= -D__STDC_CONSTANT_MACROS
  604. -OBJCFLAGS=
  605. +OBJCFLAGS=
  606. ASFLAGS= -m32 -march=i686 -fPIC
  607. AS_C=-c
  608. AS_O=-o $@
  609. @@ -58,7 +59,7 @@ DLLTOOL=
  610. WINDRES=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android-windres
  611. DEPWINDRES=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android-gcc
  612. DOXYGEN=doxygen
  613. -LDFLAGS= --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-x86 -isysroot ../../prebuilts/ndk/current/platforms/android-21/arch-x86 -march=i686 -Wl,--as-needed -Wl,-z,noexecstack -Wl,--warn-common -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample
  614. +LDFLAGS= --sysroot=../../prebuilts/ndk/current/platforms/android-24/arch-x86 -isysroot ../../prebuilts/ndk/current/platforms/android-24/arch-x86 -march=i686 -Wl,--as-needed -Wl,-z,noexecstack -Wl,--warn-common -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample
  615. LDEXEFLAGS=
  616. LDLIBFLAGS=
  617. SHFLAGS=-shared -Wl,-soname,$$(@F) -Wl,-Bsymbolic -Wl,--version-script,$(SUBDIR)lib$(NAME).ver
  618. @@ -96,7 +97,7 @@ HOSTCC_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@
  619. HOSTCC_C=-c
  620. HOSTCC_O=-o $@
  621. HOSTLD_O=-o $@
  622. -TARGET_EXEC=
  623. +TARGET_EXEC=
  624. TARGET_PATH=$(CURDIR)
  625. TARGET_SAMPLES=$(SAMPLES)
  626. CFLAGS-ffplay=
  627. @@ -216,6 +217,7 @@ HAVE_CPUNOP=yes
  628. HAVE_I686=yes
  629. !HAVE_MIPSFPU=yes
  630. !HAVE_MIPS32R2=yes
  631. +!HAVE_MIPS32R5=yes
  632. !HAVE_MIPS64R2=yes
  633. !HAVE_MIPS32R6=yes
  634. !HAVE_MIPS64R6=yes
  635. @@ -259,6 +261,7 @@ HAVE_XOP_EXTERNAL=yes
  636. !HAVE_I686_EXTERNAL=yes
  637. !HAVE_MIPSFPU_EXTERNAL=yes
  638. !HAVE_MIPS32R2_EXTERNAL=yes
  639. +!HAVE_MIPS32R5_EXTERNAL=yes
  640. !HAVE_MIPS64R2_EXTERNAL=yes
  641. !HAVE_MIPS32R6_EXTERNAL=yes
  642. !HAVE_MIPS64R6_EXTERNAL=yes
  643. @@ -302,6 +305,7 @@ HAVE_XOP_INLINE=yes
  644. !HAVE_I686_INLINE=yes
  645. !HAVE_MIPSFPU_INLINE=yes
  646. !HAVE_MIPS32R2_INLINE=yes
  647. +!HAVE_MIPS32R5_INLINE=yes
  648. !HAVE_MIPS64R2_INLINE=yes
  649. !HAVE_MIPS32R6_INLINE=yes
  650. !HAVE_MIPS64R6_INLINE=yes
  651. @@ -457,6 +461,7 @@ HAVE_POSIX_MEMALIGN=yes
  652. HAVE_SCHED_GETAFFINITY=yes
  653. !HAVE_SETCONSOLETEXTATTRIBUTE=yes
  654. !HAVE_SETCONSOLECTRLHANDLER=yes
  655. +!HAVE_SETDLLDIRECTORY=yes
  656. !HAVE_SETMODE=yes
  657. HAVE_SETRLIMIT=yes
  658. !HAVE_SLEEP=yes
  659. @@ -512,8 +517,8 @@ HAVE_ATOMICS_NATIVE=yes
  660. !HAVE_LIBC_MSVCRT=yes
  661. !HAVE_LIBDC1394_1=yes
  662. !HAVE_LIBDC1394_2=yes
  663. -!HAVE_MAKEINFO=yes
  664. -!HAVE_MAKEINFO_HTML=yes
  665. +HAVE_MAKEINFO=yes
  666. +HAVE_MAKEINFO_HTML=yes
  667. HAVE_PERL=yes
  668. HAVE_POD2MAN=yes
  669. !HAVE_SDL=yes
  670. @@ -537,8 +542,8 @@ CONFIG_MUXERS=yes
  671. CONFIG_PROTOCOLS=yes
  672. !CONFIG_DOC=yes
  673. !CONFIG_HTMLPAGES=yes
  674. -CONFIG_MANPAGES=yes
  675. -CONFIG_PODPAGES=yes
  676. +!CONFIG_MANPAGES=yes
  677. +!CONFIG_PODPAGES=yes
  678. !CONFIG_TXTPAGES=yes
  679. CONFIG_AVIO_READING_EXAMPLE=yes
  680. CONFIG_AVIO_DIR_CMD_EXAMPLE=yes
  681. diff --git a/android/include/config-armv5te.h b/android/include/config-armv5te.h
  682. index 92f19d3c86..dc780c7d65 100644
  683. --- a/android/include/config-armv5te.h
  684. +++ b/android/include/config-armv5te.h
  685. @@ -1,12 +1,12 @@
  686. /* Automatically generated by configure - do not modify! */
  687. #ifndef FFMPEG_CONFIG_H
  688. #define FFMPEG_CONFIG_H
  689. -#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"
  690. +#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-24/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"
  691. #define FFMPEG_LICENSE "LGPL version 2.1 or later"
  692. #define CONFIG_THIS_YEAR 2016
  693. #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
  694. #define AVCONV_DATADIR "/usr/local/share/ffmpeg"
  695. -#define CC_IDENT "gcc 4.9.x-google (GCC) 20140827 (prerelease)"
  696. +#define CC_IDENT "gcc 4.9 (GCC) 20150123 (prerelease)"
  697. #define av_restrict restrict
  698. #define EXTERN_PREFIX ""
  699. #define EXTERN_ASM
  700. @@ -249,6 +249,10 @@
  701. #undef HAVE_MIPS32R2
  702. #endif
  703. #define HAVE_MIPS32R2 0
  704. +#ifdef HAVE_MIPS32R5
  705. +#undef HAVE_MIPS32R5
  706. +#endif
  707. +#define HAVE_MIPS32R5 0
  708. #ifdef HAVE_MIPS64R2
  709. #undef HAVE_MIPS64R2
  710. #endif
  711. @@ -421,6 +425,10 @@
  712. #undef HAVE_MIPS32R2_EXTERNAL
  713. #endif
  714. #define HAVE_MIPS32R2_EXTERNAL 0
  715. +#ifdef HAVE_MIPS32R5_EXTERNAL
  716. +#undef HAVE_MIPS32R5_EXTERNAL
  717. +#endif
  718. +#define HAVE_MIPS32R5_EXTERNAL 0
  719. #ifdef HAVE_MIPS64R2_EXTERNAL
  720. #undef HAVE_MIPS64R2_EXTERNAL
  721. #endif
  722. @@ -593,6 +601,10 @@
  723. #undef HAVE_MIPS32R2_INLINE
  724. #endif
  725. #define HAVE_MIPS32R2_INLINE 0
  726. +#ifdef HAVE_MIPS32R5_INLINE
  727. +#undef HAVE_MIPS32R5_INLINE
  728. +#endif
  729. +#define HAVE_MIPS32R5_INLINE 0
  730. #ifdef HAVE_MIPS64R2_INLINE
  731. #undef HAVE_MIPS64R2_INLINE
  732. #endif
  733. @@ -1213,6 +1225,10 @@
  734. #undef HAVE_SETCONSOLECTRLHANDLER
  735. #endif
  736. #define HAVE_SETCONSOLECTRLHANDLER 0
  737. +#ifdef HAVE_SETDLLDIRECTORY
  738. +#undef HAVE_SETDLLDIRECTORY
  739. +#endif
  740. +#define HAVE_SETDLLDIRECTORY 0
  741. #ifdef HAVE_SETMODE
  742. #undef HAVE_SETMODE
  743. #endif
  744. @@ -1436,11 +1452,11 @@
  745. #ifdef HAVE_MAKEINFO
  746. #undef HAVE_MAKEINFO
  747. #endif
  748. -#define HAVE_MAKEINFO 0
  749. +#define HAVE_MAKEINFO 1
  750. #ifdef HAVE_MAKEINFO_HTML
  751. #undef HAVE_MAKEINFO_HTML
  752. #endif
  753. -#define HAVE_MAKEINFO_HTML 0
  754. +#define HAVE_MAKEINFO_HTML 1
  755. #ifdef HAVE_PERL
  756. #undef HAVE_PERL
  757. #endif
  758. @@ -1494,8 +1510,8 @@
  759. #define CONFIG_PROTOCOLS 1
  760. #define CONFIG_DOC 0
  761. #define CONFIG_HTMLPAGES 0
  762. -#define CONFIG_MANPAGES 1
  763. -#define CONFIG_PODPAGES 1
  764. +#define CONFIG_MANPAGES 0
  765. +#define CONFIG_PODPAGES 0
  766. #define CONFIG_TXTPAGES 0
  767. #define CONFIG_AVIO_READING_EXAMPLE 1
  768. #define CONFIG_AVIO_DIR_CMD_EXAMPLE 1
  769. diff --git a/android/include/config-armv7-a-neon.h b/android/include/config-armv7-a-neon.h
  770. index 70f7ba98b2..e9ab959882 100644
  771. --- a/android/include/config-armv7-a-neon.h
  772. +++ b/android/include/config-armv7-a-neon.h
  773. @@ -1,12 +1,12 @@
  774. /* Automatically generated by configure - do not modify! */
  775. #ifndef FFMPEG_CONFIG_H
  776. #define FFMPEG_CONFIG_H
  777. -#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"
  778. +#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-24/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"
  779. #define FFMPEG_LICENSE "LGPL version 2.1 or later"
  780. #define CONFIG_THIS_YEAR 2016
  781. #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
  782. #define AVCONV_DATADIR "/usr/local/share/ffmpeg"
  783. -#define CC_IDENT "gcc 4.9.x-google (GCC) 20140827 (prerelease)"
  784. +#define CC_IDENT "gcc 4.9 (GCC) 20150123 (prerelease)"
  785. #define av_restrict restrict
  786. #define EXTERN_PREFIX ""
  787. #define EXTERN_ASM
  788. @@ -249,6 +249,10 @@
  789. #undef HAVE_MIPS32R2
  790. #endif
  791. #define HAVE_MIPS32R2 0
  792. +#ifdef HAVE_MIPS32R5
  793. +#undef HAVE_MIPS32R5
  794. +#endif
  795. +#define HAVE_MIPS32R5 0
  796. #ifdef HAVE_MIPS64R2
  797. #undef HAVE_MIPS64R2
  798. #endif
  799. @@ -421,6 +425,10 @@
  800. #undef HAVE_MIPS32R2_EXTERNAL
  801. #endif
  802. #define HAVE_MIPS32R2_EXTERNAL 0
  803. +#ifdef HAVE_MIPS32R5_EXTERNAL
  804. +#undef HAVE_MIPS32R5_EXTERNAL
  805. +#endif
  806. +#define HAVE_MIPS32R5_EXTERNAL 0
  807. #ifdef HAVE_MIPS64R2_EXTERNAL
  808. #undef HAVE_MIPS64R2_EXTERNAL
  809. #endif
  810. @@ -593,6 +601,10 @@
  811. #undef HAVE_MIPS32R2_INLINE
  812. #endif
  813. #define HAVE_MIPS32R2_INLINE 0
  814. +#ifdef HAVE_MIPS32R5_INLINE
  815. +#undef HAVE_MIPS32R5_INLINE
  816. +#endif
  817. +#define HAVE_MIPS32R5_INLINE 0
  818. #ifdef HAVE_MIPS64R2_INLINE
  819. #undef HAVE_MIPS64R2_INLINE
  820. #endif
  821. @@ -1213,6 +1225,10 @@
  822. #undef HAVE_SETCONSOLECTRLHANDLER
  823. #endif
  824. #define HAVE_SETCONSOLECTRLHANDLER 0
  825. +#ifdef HAVE_SETDLLDIRECTORY
  826. +#undef HAVE_SETDLLDIRECTORY
  827. +#endif
  828. +#define HAVE_SETDLLDIRECTORY 0
  829. #ifdef HAVE_SETMODE
  830. #undef HAVE_SETMODE
  831. #endif
  832. @@ -1436,11 +1452,11 @@
  833. #ifdef HAVE_MAKEINFO
  834. #undef HAVE_MAKEINFO
  835. #endif
  836. -#define HAVE_MAKEINFO 0
  837. +#define HAVE_MAKEINFO 1
  838. #ifdef HAVE_MAKEINFO_HTML
  839. #undef HAVE_MAKEINFO_HTML
  840. #endif
  841. -#define HAVE_MAKEINFO_HTML 0
  842. +#define HAVE_MAKEINFO_HTML 1
  843. #ifdef HAVE_PERL
  844. #undef HAVE_PERL
  845. #endif
  846. @@ -1494,8 +1510,8 @@
  847. #define CONFIG_PROTOCOLS 1
  848. #define CONFIG_DOC 0
  849. #define CONFIG_HTMLPAGES 0
  850. -#define CONFIG_MANPAGES 1
  851. -#define CONFIG_PODPAGES 1
  852. +#define CONFIG_MANPAGES 0
  853. +#define CONFIG_PODPAGES 0
  854. #define CONFIG_TXTPAGES 0
  855. #define CONFIG_AVIO_READING_EXAMPLE 1
  856. #define CONFIG_AVIO_DIR_CMD_EXAMPLE 1
  857. diff --git a/android/include/config-armv7-a.h b/android/include/config-armv7-a.h
  858. index 89987d34cc..30d8b3be4b 100644
  859. --- a/android/include/config-armv7-a.h
  860. +++ b/android/include/config-armv7-a.h
  861. @@ -1,12 +1,12 @@
  862. /* Automatically generated by configure - do not modify! */
  863. #ifndef FFMPEG_CONFIG_H
  864. #define FFMPEG_CONFIG_H
  865. -#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"
  866. +#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-24/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"
  867. #define FFMPEG_LICENSE "LGPL version 2.1 or later"
  868. #define CONFIG_THIS_YEAR 2016
  869. #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
  870. #define AVCONV_DATADIR "/usr/local/share/ffmpeg"
  871. -#define CC_IDENT "gcc 4.9.x-google (GCC) 20140827 (prerelease)"
  872. +#define CC_IDENT "gcc 4.9 (GCC) 20150123 (prerelease)"
  873. #define av_restrict restrict
  874. #define EXTERN_PREFIX ""
  875. #define EXTERN_ASM
  876. @@ -249,6 +249,10 @@
  877. #undef HAVE_MIPS32R2
  878. #endif
  879. #define HAVE_MIPS32R2 0
  880. +#ifdef HAVE_MIPS32R5
  881. +#undef HAVE_MIPS32R5
  882. +#endif
  883. +#define HAVE_MIPS32R5 0
  884. #ifdef HAVE_MIPS64R2
  885. #undef HAVE_MIPS64R2
  886. #endif
  887. @@ -421,6 +425,10 @@
  888. #undef HAVE_MIPS32R2_EXTERNAL
  889. #endif
  890. #define HAVE_MIPS32R2_EXTERNAL 0
  891. +#ifdef HAVE_MIPS32R5_EXTERNAL
  892. +#undef HAVE_MIPS32R5_EXTERNAL
  893. +#endif
  894. +#define HAVE_MIPS32R5_EXTERNAL 0
  895. #ifdef HAVE_MIPS64R2_EXTERNAL
  896. #undef HAVE_MIPS64R2_EXTERNAL
  897. #endif
  898. @@ -593,6 +601,10 @@
  899. #undef HAVE_MIPS32R2_INLINE
  900. #endif
  901. #define HAVE_MIPS32R2_INLINE 0
  902. +#ifdef HAVE_MIPS32R5_INLINE
  903. +#undef HAVE_MIPS32R5_INLINE
  904. +#endif
  905. +#define HAVE_MIPS32R5_INLINE 0
  906. #ifdef HAVE_MIPS64R2_INLINE
  907. #undef HAVE_MIPS64R2_INLINE
  908. #endif
  909. @@ -1213,6 +1225,10 @@
  910. #undef HAVE_SETCONSOLECTRLHANDLER
  911. #endif
  912. #define HAVE_SETCONSOLECTRLHANDLER 0
  913. +#ifdef HAVE_SETDLLDIRECTORY
  914. +#undef HAVE_SETDLLDIRECTORY
  915. +#endif
  916. +#define HAVE_SETDLLDIRECTORY 0
  917. #ifdef HAVE_SETMODE
  918. #undef HAVE_SETMODE
  919. #endif
  920. @@ -1436,11 +1452,11 @@
  921. #ifdef HAVE_MAKEINFO
  922. #undef HAVE_MAKEINFO
  923. #endif
  924. -#define HAVE_MAKEINFO 0
  925. +#define HAVE_MAKEINFO 1
  926. #ifdef HAVE_MAKEINFO_HTML
  927. #undef HAVE_MAKEINFO_HTML
  928. #endif
  929. -#define HAVE_MAKEINFO_HTML 0
  930. +#define HAVE_MAKEINFO_HTML 1
  931. #ifdef HAVE_PERL
  932. #undef HAVE_PERL
  933. #endif
  934. @@ -1494,8 +1510,8 @@
  935. #define CONFIG_PROTOCOLS 1
  936. #define CONFIG_DOC 0
  937. #define CONFIG_HTMLPAGES 0
  938. -#define CONFIG_MANPAGES 1
  939. -#define CONFIG_PODPAGES 1
  940. +#define CONFIG_MANPAGES 0
  941. +#define CONFIG_PODPAGES 0
  942. #define CONFIG_TXTPAGES 0
  943. #define CONFIG_AVIO_READING_EXAMPLE 1
  944. #define CONFIG_AVIO_DIR_CMD_EXAMPLE 1
  945. diff --git a/android/include/config-armv8-a.h b/android/include/config-armv8-a.h
  946. index 38a37b675d..c994cbe49e 100644
  947. --- a/android/include/config-armv8-a.h
  948. +++ b/android/include/config-armv8-a.h
  949. @@ -1,12 +1,12 @@
  950. /* Automatically generated by configure - do not modify! */
  951. #ifndef FFMPEG_CONFIG_H
  952. #define FFMPEG_CONFIG_H
  953. -#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"
  954. +#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-24/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"
  955. #define FFMPEG_LICENSE "LGPL version 2.1 or later"
  956. #define CONFIG_THIS_YEAR 2016
  957. #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
  958. #define AVCONV_DATADIR "/usr/local/share/ffmpeg"
  959. -#define CC_IDENT "gcc 4.9.x-google (GCC) 20140827 (prerelease)"
  960. +#define CC_IDENT "gcc 4.9 (GCC) 20150123 (prerelease)"
  961. #define av_restrict restrict
  962. #define EXTERN_PREFIX ""
  963. #define EXTERN_ASM
  964. @@ -249,6 +249,10 @@
  965. #undef HAVE_MIPS32R2
  966. #endif
  967. #define HAVE_MIPS32R2 0
  968. +#ifdef HAVE_MIPS32R5
  969. +#undef HAVE_MIPS32R5
  970. +#endif
  971. +#define HAVE_MIPS32R5 0
  972. #ifdef HAVE_MIPS64R2
  973. #undef HAVE_MIPS64R2
  974. #endif
  975. @@ -421,6 +425,10 @@
  976. #undef HAVE_MIPS32R2_EXTERNAL
  977. #endif
  978. #define HAVE_MIPS32R2_EXTERNAL 0
  979. +#ifdef HAVE_MIPS32R5_EXTERNAL
  980. +#undef HAVE_MIPS32R5_EXTERNAL
  981. +#endif
  982. +#define HAVE_MIPS32R5_EXTERNAL 0
  983. #ifdef HAVE_MIPS64R2_EXTERNAL
  984. #undef HAVE_MIPS64R2_EXTERNAL
  985. #endif
  986. @@ -593,6 +601,10 @@
  987. #undef HAVE_MIPS32R2_INLINE
  988. #endif
  989. #define HAVE_MIPS32R2_INLINE 0
  990. +#ifdef HAVE_MIPS32R5_INLINE
  991. +#undef HAVE_MIPS32R5_INLINE
  992. +#endif
  993. +#define HAVE_MIPS32R5_INLINE 0
  994. #ifdef HAVE_MIPS64R2_INLINE
  995. #undef HAVE_MIPS64R2_INLINE
  996. #endif
  997. @@ -1213,6 +1225,10 @@
  998. #undef HAVE_SETCONSOLECTRLHANDLER
  999. #endif
  1000. #define HAVE_SETCONSOLECTRLHANDLER 0
  1001. +#ifdef HAVE_SETDLLDIRECTORY
  1002. +#undef HAVE_SETDLLDIRECTORY
  1003. +#endif
  1004. +#define HAVE_SETDLLDIRECTORY 0
  1005. #ifdef HAVE_SETMODE
  1006. #undef HAVE_SETMODE
  1007. #endif
  1008. @@ -1436,11 +1452,11 @@
  1009. #ifdef HAVE_MAKEINFO
  1010. #undef HAVE_MAKEINFO
  1011. #endif
  1012. -#define HAVE_MAKEINFO 0
  1013. +#define HAVE_MAKEINFO 1
  1014. #ifdef HAVE_MAKEINFO_HTML
  1015. #undef HAVE_MAKEINFO_HTML
  1016. #endif
  1017. -#define HAVE_MAKEINFO_HTML 0
  1018. +#define HAVE_MAKEINFO_HTML 1
  1019. #ifdef HAVE_PERL
  1020. #undef HAVE_PERL
  1021. #endif
  1022. @@ -1494,8 +1510,8 @@
  1023. #define CONFIG_PROTOCOLS 1
  1024. #define CONFIG_DOC 0
  1025. #define CONFIG_HTMLPAGES 0
  1026. -#define CONFIG_MANPAGES 1
  1027. -#define CONFIG_PODPAGES 1
  1028. +#define CONFIG_MANPAGES 0
  1029. +#define CONFIG_PODPAGES 0
  1030. #define CONFIG_TXTPAGES 0
  1031. #define CONFIG_AVIO_READING_EXAMPLE 1
  1032. #define CONFIG_AVIO_DIR_CMD_EXAMPLE 1
  1033. diff --git a/android/include/config-silvermont.h b/android/include/config-silvermont.h
  1034. index 28f1b5a761..9286590417 100644
  1035. --- a/android/include/config-silvermont.h
  1036. +++ b/android/include/config-silvermont.h
  1037. @@ -1,12 +1,12 @@
  1038. /* Automatically generated by configure - do not modify! */
  1039. #ifndef FFMPEG_CONFIG_H
  1040. #define FFMPEG_CONFIG_H
  1041. -#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"
  1042. +#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-24/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"
  1043. #define FFMPEG_LICENSE "LGPL version 2.1 or later"
  1044. #define CONFIG_THIS_YEAR 2016
  1045. #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
  1046. #define AVCONV_DATADIR "/usr/local/share/ffmpeg"
  1047. -#define CC_IDENT "gcc 4.9 (GCC) 20140827 (prerelease)"
  1048. +#define CC_IDENT "gcc 4.9 (GCC) 20150123 (prerelease)"
  1049. #define av_restrict restrict
  1050. #define EXTERN_PREFIX ""
  1051. #define EXTERN_ASM
  1052. @@ -249,6 +249,10 @@
  1053. #undef HAVE_MIPS32R2
  1054. #endif
  1055. #define HAVE_MIPS32R2 0
  1056. +#ifdef HAVE_MIPS32R5
  1057. +#undef HAVE_MIPS32R5
  1058. +#endif
  1059. +#define HAVE_MIPS32R5 0
  1060. #ifdef HAVE_MIPS64R2
  1061. #undef HAVE_MIPS64R2
  1062. #endif
  1063. @@ -421,6 +425,10 @@
  1064. #undef HAVE_MIPS32R2_EXTERNAL
  1065. #endif
  1066. #define HAVE_MIPS32R2_EXTERNAL 0
  1067. +#ifdef HAVE_MIPS32R5_EXTERNAL
  1068. +#undef HAVE_MIPS32R5_EXTERNAL
  1069. +#endif
  1070. +#define HAVE_MIPS32R5_EXTERNAL 0
  1071. #ifdef HAVE_MIPS64R2_EXTERNAL
  1072. #undef HAVE_MIPS64R2_EXTERNAL
  1073. #endif
  1074. @@ -593,6 +601,10 @@
  1075. #undef HAVE_MIPS32R2_INLINE
  1076. #endif
  1077. #define HAVE_MIPS32R2_INLINE 0
  1078. +#ifdef HAVE_MIPS32R5_INLINE
  1079. +#undef HAVE_MIPS32R5_INLINE
  1080. +#endif
  1081. +#define HAVE_MIPS32R5_INLINE 0
  1082. #ifdef HAVE_MIPS64R2_INLINE
  1083. #undef HAVE_MIPS64R2_INLINE
  1084. #endif
  1085. @@ -1213,6 +1225,10 @@
  1086. #undef HAVE_SETCONSOLECTRLHANDLER
  1087. #endif
  1088. #define HAVE_SETCONSOLECTRLHANDLER 0
  1089. +#ifdef HAVE_SETDLLDIRECTORY
  1090. +#undef HAVE_SETDLLDIRECTORY
  1091. +#endif
  1092. +#define HAVE_SETDLLDIRECTORY 0
  1093. #ifdef HAVE_SETMODE
  1094. #undef HAVE_SETMODE
  1095. #endif
  1096. @@ -1436,11 +1452,11 @@
  1097. #ifdef HAVE_MAKEINFO
  1098. #undef HAVE_MAKEINFO
  1099. #endif
  1100. -#define HAVE_MAKEINFO 0
  1101. +#define HAVE_MAKEINFO 1
  1102. #ifdef HAVE_MAKEINFO_HTML
  1103. #undef HAVE_MAKEINFO_HTML
  1104. #endif
  1105. -#define HAVE_MAKEINFO_HTML 0
  1106. +#define HAVE_MAKEINFO_HTML 1
  1107. #ifdef HAVE_PERL
  1108. #undef HAVE_PERL
  1109. #endif
  1110. @@ -1494,8 +1510,8 @@
  1111. #define CONFIG_PROTOCOLS 1
  1112. #define CONFIG_DOC 0
  1113. #define CONFIG_HTMLPAGES 0
  1114. -#define CONFIG_MANPAGES 1
  1115. -#define CONFIG_PODPAGES 1
  1116. +#define CONFIG_MANPAGES 0
  1117. +#define CONFIG_PODPAGES 0
  1118. #define CONFIG_TXTPAGES 0
  1119. #define CONFIG_AVIO_READING_EXAMPLE 1
  1120. #define CONFIG_AVIO_DIR_CMD_EXAMPLE 1
  1121. diff --git a/android/include/config-x86.h b/android/include/config-x86.h
  1122. index 236464e605..cf0d5ae08d 100644
  1123. --- a/android/include/config-x86.h
  1124. +++ b/android/include/config-x86.h
  1125. @@ -1,12 +1,12 @@
  1126. /* Automatically generated by configure - do not modify! */
  1127. #ifndef FFMPEG_CONFIG_H
  1128. #define FFMPEG_CONFIG_H
  1129. -#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"
  1130. +#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-24/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"
  1131. #define FFMPEG_LICENSE "LGPL version 2.1 or later"
  1132. #define CONFIG_THIS_YEAR 2016
  1133. #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
  1134. #define AVCONV_DATADIR "/usr/local/share/ffmpeg"
  1135. -#define CC_IDENT "gcc 4.9 (GCC) 20140827 (prerelease)"
  1136. +#define CC_IDENT "gcc 4.9 (GCC) 20150123 (prerelease)"
  1137. #define av_restrict restrict
  1138. #define EXTERN_PREFIX ""
  1139. #define EXTERN_ASM
  1140. @@ -249,6 +249,10 @@
  1141. #undef HAVE_MIPS32R2
  1142. #endif
  1143. #define HAVE_MIPS32R2 0
  1144. +#ifdef HAVE_MIPS32R5
  1145. +#undef HAVE_MIPS32R5
  1146. +#endif
  1147. +#define HAVE_MIPS32R5 0
  1148. #ifdef HAVE_MIPS64R2
  1149. #undef HAVE_MIPS64R2
  1150. #endif
  1151. @@ -421,6 +425,10 @@
  1152. #undef HAVE_MIPS32R2_EXTERNAL
  1153. #endif
  1154. #define HAVE_MIPS32R2_EXTERNAL 0
  1155. +#ifdef HAVE_MIPS32R5_EXTERNAL
  1156. +#undef HAVE_MIPS32R5_EXTERNAL
  1157. +#endif
  1158. +#define HAVE_MIPS32R5_EXTERNAL 0
  1159. #ifdef HAVE_MIPS64R2_EXTERNAL
  1160. #undef HAVE_MIPS64R2_EXTERNAL
  1161. #endif
  1162. @@ -593,6 +601,10 @@
  1163. #undef HAVE_MIPS32R2_INLINE
  1164. #endif
  1165. #define HAVE_MIPS32R2_INLINE 0
  1166. +#ifdef HAVE_MIPS32R5_INLINE
  1167. +#undef HAVE_MIPS32R5_INLINE
  1168. +#endif
  1169. +#define HAVE_MIPS32R5_INLINE 0
  1170. #ifdef HAVE_MIPS64R2_INLINE
  1171. #undef HAVE_MIPS64R2_INLINE
  1172. #endif
  1173. @@ -1213,6 +1225,10 @@
  1174. #undef HAVE_SETCONSOLECTRLHANDLER
  1175. #endif
  1176. #define HAVE_SETCONSOLECTRLHANDLER 0
  1177. +#ifdef HAVE_SETDLLDIRECTORY
  1178. +#undef HAVE_SETDLLDIRECTORY
  1179. +#endif
  1180. +#define HAVE_SETDLLDIRECTORY 0
  1181. #ifdef HAVE_SETMODE
  1182. #undef HAVE_SETMODE
  1183. #endif
  1184. @@ -1436,11 +1452,11 @@
  1185. #ifdef HAVE_MAKEINFO
  1186. #undef HAVE_MAKEINFO
  1187. #endif
  1188. -#define HAVE_MAKEINFO 0
  1189. +#define HAVE_MAKEINFO 1
  1190. #ifdef HAVE_MAKEINFO_HTML
  1191. #undef HAVE_MAKEINFO_HTML
  1192. #endif
  1193. -#define HAVE_MAKEINFO_HTML 0
  1194. +#define HAVE_MAKEINFO_HTML 1
  1195. #ifdef HAVE_PERL
  1196. #undef HAVE_PERL
  1197. #endif
  1198. @@ -1494,8 +1510,8 @@
  1199. #define CONFIG_PROTOCOLS 1
  1200. #define CONFIG_DOC 0
  1201. #define CONFIG_HTMLPAGES 0
  1202. -#define CONFIG_MANPAGES 1
  1203. -#define CONFIG_PODPAGES 1
  1204. +#define CONFIG_MANPAGES 0
  1205. +#define CONFIG_PODPAGES 0
  1206. #define CONFIG_TXTPAGES 0
  1207. #define CONFIG_AVIO_READING_EXAMPLE 1
  1208. #define CONFIG_AVIO_DIR_CMD_EXAMPLE 1
  1209. diff --git a/android/include/config.asm b/android/include/config.asm
  1210. index 77a1861e15..247c4fbb0c 100644
  1211. --- a/android/include/config.asm
  1212. +++ b/android/include/config.asm
  1213. @@ -56,6 +56,7 @@
  1214. %define HAVE_I686 1
  1215. %define HAVE_MIPSFPU 0
  1216. %define HAVE_MIPS32R2 0
  1217. +%define HAVE_MIPS32R5 0
  1218. %define HAVE_MIPS64R2 0
  1219. %define HAVE_MIPS32R6 0
  1220. %define HAVE_MIPS64R6 0
  1221. @@ -99,6 +100,7 @@
  1222. %define HAVE_I686_EXTERNAL 0
  1223. %define HAVE_MIPSFPU_EXTERNAL 0
  1224. %define HAVE_MIPS32R2_EXTERNAL 0
  1225. +%define HAVE_MIPS32R5_EXTERNAL 0
  1226. %define HAVE_MIPS64R2_EXTERNAL 0
  1227. %define HAVE_MIPS32R6_EXTERNAL 0
  1228. %define HAVE_MIPS64R6_EXTERNAL 0
  1229. @@ -142,6 +144,7 @@
  1230. %define HAVE_I686_INLINE 0
  1231. %define HAVE_MIPSFPU_INLINE 0
  1232. %define HAVE_MIPS32R2_INLINE 0
  1233. +%define HAVE_MIPS32R5_INLINE 0
  1234. %define HAVE_MIPS64R2_INLINE 0
  1235. %define HAVE_MIPS32R6_INLINE 0
  1236. %define HAVE_MIPS64R6_INLINE 0
  1237. @@ -297,6 +300,7 @@
  1238. %define HAVE_SCHED_GETAFFINITY 1
  1239. %define HAVE_SETCONSOLETEXTATTRIBUTE 0
  1240. %define HAVE_SETCONSOLECTRLHANDLER 0
  1241. +%define HAVE_SETDLLDIRECTORY 0
  1242. %define HAVE_SETMODE 0
  1243. %define HAVE_SETRLIMIT 1
  1244. %define HAVE_SLEEP 0
  1245. @@ -352,8 +356,8 @@
  1246. %define HAVE_LIBC_MSVCRT 0
  1247. %define HAVE_LIBDC1394_1 0
  1248. %define HAVE_LIBDC1394_2 0
  1249. -%define HAVE_MAKEINFO 0
  1250. -%define HAVE_MAKEINFO_HTML 0
  1251. +%define HAVE_MAKEINFO 1
  1252. +%define HAVE_MAKEINFO_HTML 1
  1253. %define HAVE_PERL 1
  1254. %define HAVE_POD2MAN 1
  1255. %define HAVE_SDL 0
  1256. @@ -377,8 +381,8 @@
  1257. %define CONFIG_PROTOCOLS 1
  1258. %define CONFIG_DOC 0
  1259. %define CONFIG_HTMLPAGES 0
  1260. -%define CONFIG_MANPAGES 1
  1261. -%define CONFIG_PODPAGES 1
  1262. +%define CONFIG_MANPAGES 0
  1263. +%define CONFIG_PODPAGES 0
  1264. %define CONFIG_TXTPAGES 0
  1265. %define CONFIG_AVIO_READING_EXAMPLE 1
  1266. %define CONFIG_AVIO_DIR_CMD_EXAMPLE 1
  1267. diff --git a/gen-android-configs b/gen-android-configs
  1268. index 6f1da875f1..23b7dde11a 100755
  1269. --- a/gen-android-configs
  1270. +++ b/gen-android-configs
  1271. @@ -2,10 +2,10 @@
  1272. #
  1273. # Generate configurations for various FFMPEG targets
  1274. TARGETS="armv5te armv7-a armv7-a-neon armv8-a silvermont x86"
  1275. -SYSROOT_BASE="../../prebuilts/ndk/current/platforms/android-21"
  1276. +SYSROOT_BASE="../../prebuilts/ndk/current/platforms/android-24"
  1277. TOOLS_BASE="../../prebuilts/gcc/linux-x86"
  1278.  
  1279. -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"
  1280. +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"
  1281.  
  1282. 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"
  1283.  
  1284. --
  1285. 2.11.0
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!