ffmpeg: Update configs and makefiles for FFMPEG 3.0cm-13.0-3.0-test

Change-Id: If99ca4a37ff6c1781acaa0f7d57dead7b54a5931

1 files changed, 184 insertions, 55 deletions

diff --git a/android/include/config-armv7-a.h b/android/include/config-armv7-a.h
index 2ffcc733b8..89987d34cc 100644
--- a/android/include/config-armv7-a.h
+++ b/android/include/config-armv7-a.h
@@ -3,7 +3,7 @@
 #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_LICENSE "LGPL version 2.1 or later"
-#define CONFIG_THIS_YEAR 2015
+#define CONFIG_THIS_YEAR 2016
 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
 #define AVCONV_DATADIR "/usr/local/share/ffmpeg"
 #define CC_IDENT "gcc 4.9.x-google (GCC) 20140827 (prerelease)"
@@ -169,6 +169,10 @@
 #undef HAVE_VSX
 #endif
 #define HAVE_VSX 0
+#ifdef HAVE_AESNI
+#undef HAVE_AESNI
+#endif
+#define HAVE_AESNI 0
 #ifdef HAVE_AMD3DNOW
 #undef HAVE_AMD3DNOW
 #endif
@@ -245,18 +249,22 @@
 #undef HAVE_MIPS32R2
 #endif
 #define HAVE_MIPS32R2 0
-#ifdef HAVE_MIPS32R5
-#undef HAVE_MIPS32R5
+#ifdef HAVE_MIPS64R2
+#undef HAVE_MIPS64R2
+#endif
+#define HAVE_MIPS64R2 0
+#ifdef HAVE_MIPS32R6
+#undef HAVE_MIPS32R6
 #endif
-#define HAVE_MIPS32R5 0
+#define HAVE_MIPS32R6 0
 #ifdef HAVE_MIPS64R6
 #undef HAVE_MIPS64R6
 #endif
 #define HAVE_MIPS64R6 0
-#ifdef HAVE_MIPSDSPR1
-#undef HAVE_MIPSDSPR1
+#ifdef HAVE_MIPSDSP
+#undef HAVE_MIPSDSP
 #endif
-#define HAVE_MIPSDSPR1 0
+#define HAVE_MIPSDSP 0
 #ifdef HAVE_MIPSDSPR2
 #undef HAVE_MIPSDSPR2
 #endif
@@ -333,6 +341,10 @@
 #undef HAVE_VSX_EXTERNAL
 #endif
 #define HAVE_VSX_EXTERNAL 0
+#ifdef HAVE_AESNI_EXTERNAL
+#undef HAVE_AESNI_EXTERNAL
+#endif
+#define HAVE_AESNI_EXTERNAL 0
 #ifdef HAVE_AMD3DNOW_EXTERNAL
 #undef HAVE_AMD3DNOW_EXTERNAL
 #endif
@@ -409,18 +421,22 @@
 #undef HAVE_MIPS32R2_EXTERNAL
 #endif
 #define HAVE_MIPS32R2_EXTERNAL 0
-#ifdef HAVE_MIPS32R5_EXTERNAL
-#undef HAVE_MIPS32R5_EXTERNAL
+#ifdef HAVE_MIPS64R2_EXTERNAL
+#undef HAVE_MIPS64R2_EXTERNAL
 #endif
-#define HAVE_MIPS32R5_EXTERNAL 0
+#define HAVE_MIPS64R2_EXTERNAL 0
+#ifdef HAVE_MIPS32R6_EXTERNAL
+#undef HAVE_MIPS32R6_EXTERNAL
+#endif
+#define HAVE_MIPS32R6_EXTERNAL 0
 #ifdef HAVE_MIPS64R6_EXTERNAL
 #undef HAVE_MIPS64R6_EXTERNAL
 #endif
 #define HAVE_MIPS64R6_EXTERNAL 0
-#ifdef HAVE_MIPSDSPR1_EXTERNAL
-#undef HAVE_MIPSDSPR1_EXTERNAL
+#ifdef HAVE_MIPSDSP_EXTERNAL
+#undef HAVE_MIPSDSP_EXTERNAL
 #endif
-#define HAVE_MIPSDSPR1_EXTERNAL 0
+#define HAVE_MIPSDSP_EXTERNAL 0
 #ifdef HAVE_MIPSDSPR2_EXTERNAL
 #undef HAVE_MIPSDSPR2_EXTERNAL
 #endif
@@ -497,6 +513,10 @@
 #undef HAVE_VSX_INLINE
 #endif
 #define HAVE_VSX_INLINE 0
+#ifdef HAVE_AESNI_INLINE
+#undef HAVE_AESNI_INLINE
+#endif
+#define HAVE_AESNI_INLINE 0
 #ifdef HAVE_AMD3DNOW_INLINE
 #undef HAVE_AMD3DNOW_INLINE
 #endif
@@ -573,18 +593,22 @@
 #undef HAVE_MIPS32R2_INLINE
 #endif
 #define HAVE_MIPS32R2_INLINE 0
-#ifdef HAVE_MIPS32R5_INLINE
-#undef HAVE_MIPS32R5_INLINE
+#ifdef HAVE_MIPS64R2_INLINE
+#undef HAVE_MIPS64R2_INLINE
+#endif
+#define HAVE_MIPS64R2_INLINE 0
+#ifdef HAVE_MIPS32R6_INLINE
+#undef HAVE_MIPS32R6_INLINE
 #endif
-#define HAVE_MIPS32R5_INLINE 0
+#define HAVE_MIPS32R6_INLINE 0
 #ifdef HAVE_MIPS64R6_INLINE
 #undef HAVE_MIPS64R6_INLINE
 #endif
 #define HAVE_MIPS64R6_INLINE 0
-#ifdef HAVE_MIPSDSPR1_INLINE
-#undef HAVE_MIPSDSPR1_INLINE
+#ifdef HAVE_MIPSDSP_INLINE
+#undef HAVE_MIPSDSP_INLINE
 #endif
-#define HAVE_MIPSDSPR1_INLINE 0
+#define HAVE_MIPSDSP_INLINE 0
 #ifdef HAVE_MIPSDSPR2_INLINE
 #undef HAVE_MIPSDSPR2_INLINE
 #endif
@@ -681,6 +705,14 @@
 #undef HAVE_SYNC_VAL_COMPARE_AND_SWAP
 #endif
 #define HAVE_SYNC_VAL_COMPARE_AND_SWAP 1
+#ifdef HAVE_CABS
+#undef HAVE_CABS
+#endif
+#define HAVE_CABS 0
+#ifdef HAVE_CEXP
+#undef HAVE_CEXP
+#endif
+#define HAVE_CEXP 0
 #ifdef HAVE_INLINE_ASM
 #undef HAVE_INLINE_ASM
 #endif
@@ -797,6 +829,18 @@
 #undef HAVE_MALLOC_H
 #endif
 #define HAVE_MALLOC_H 1
+#ifdef HAVE_OPENCV2_CORE_CORE_C_H
+#undef HAVE_OPENCV2_CORE_CORE_C_H
+#endif
+#define HAVE_OPENCV2_CORE_CORE_C_H 0
+#ifdef HAVE_OPENJPEG_2_1_OPENJPEG_H
+#undef HAVE_OPENJPEG_2_1_OPENJPEG_H
+#endif
+#define HAVE_OPENJPEG_2_1_OPENJPEG_H 0
+#ifdef HAVE_OPENJPEG_2_0_OPENJPEG_H
+#undef HAVE_OPENJPEG_2_0_OPENJPEG_H
+#endif
+#define HAVE_OPENJPEG_2_0_OPENJPEG_H 0
 #ifdef HAVE_OPENJPEG_1_5_OPENJPEG_H
 #undef HAVE_OPENJPEG_1_5_OPENJPEG_H
 #endif
@@ -917,6 +961,14 @@
 #undef HAVE_EXPF
 #endif
 #define HAVE_EXPF 1
+#ifdef HAVE_HYPOT
+#undef HAVE_HYPOT
+#endif
+#define HAVE_HYPOT 1
+#ifdef HAVE_ISFINITE
+#undef HAVE_ISFINITE
+#endif
+#define HAVE_ISFINITE 1
 #ifdef HAVE_ISINF
 #undef HAVE_ISINF
 #endif
@@ -993,6 +1045,10 @@
 #undef HAVE_ALIGNED_MALLOC
 #endif
 #define HAVE_ALIGNED_MALLOC 0
+#ifdef HAVE_ARC4RANDOM
+#undef HAVE_ARC4RANDOM
+#endif
+#define HAVE_ARC4RANDOM 1
 #ifdef HAVE_CLOCK_GETTIME
 #undef HAVE_CLOCK_GETTIME
 #endif
@@ -1057,10 +1113,6 @@
 #undef HAVE_GETRUSAGE
 #endif
 #define HAVE_GETRUSAGE 1
-#ifdef HAVE_GETSERVBYPORT
-#undef HAVE_GETSERVBYPORT
-#endif
-#define HAVE_GETSERVBYPORT 1
 #ifdef HAVE_GETSYSTEMTIMEASFILETIME
 #undef HAVE_GETSYSTEMTIMEASFILETIME
 #endif
@@ -1189,6 +1241,10 @@
 #undef HAVE_USLEEP
 #endif
 #define HAVE_USLEEP 1
+#ifdef HAVE_UTGETOSTYPEFROMSTRING
+#undef HAVE_UTGETOSTYPEFROMSTRING
+#endif
+#define HAVE_UTGETOSTYPEFROMSTRING 0
 #ifdef HAVE_VIRTUALALLOC
 #undef HAVE_VIRTUALALLOC
 #endif
@@ -1253,6 +1309,10 @@
 #undef HAVE_IBM_ASM
 #endif
 #define HAVE_IBM_ASM 0
+#ifdef HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS
+#undef HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS
+#endif
+#define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 0
 #ifdef HAVE_INLINE_ASM_LABELS
 #undef HAVE_INLINE_ASM_LABELS
 #endif
@@ -1261,10 +1321,6 @@
 #undef HAVE_INLINE_ASM_NONLOCAL_LABELS
 #endif
 #define HAVE_INLINE_ASM_NONLOCAL_LABELS 1
-#ifdef HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS
-#undef HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS
-#endif
-#define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 0
 #ifdef HAVE_PRAGMA_DEPRECATED
 #undef HAVE_PRAGMA_DEPRECATED
 #endif
@@ -1305,10 +1361,6 @@
 #undef HAVE_STRUCT_ADDRINFO
 #endif
 #define HAVE_STRUCT_ADDRINFO 1
-#ifdef HAVE_STRUCT_DCADEC_EXSS_INFO_MATRIX_ENCODING
-#undef HAVE_STRUCT_DCADEC_EXSS_INFO_MATRIX_ENCODING
-#endif
-#define HAVE_STRUCT_DCADEC_EXSS_INFO_MATRIX_ENCODING 0
 #ifdef HAVE_STRUCT_GROUP_SOURCE_REQ
 #undef HAVE_STRUCT_GROUP_SOURCE_REQ
 #endif
@@ -1361,14 +1413,14 @@
 #undef HAVE_DOS_PATHS
 #endif
 #define HAVE_DOS_PATHS 0
-#ifdef HAVE_DXVA2API_COBJ
-#undef HAVE_DXVA2API_COBJ
-#endif
-#define HAVE_DXVA2API_COBJ 0
 #ifdef HAVE_DXVA2_LIB
 #undef HAVE_DXVA2_LIB
 #endif
 #define HAVE_DXVA2_LIB 0
+#ifdef HAVE_DXVA2API_COBJ
+#undef HAVE_DXVA2API_COBJ
+#endif
+#define HAVE_DXVA2API_COBJ 0
 #ifdef HAVE_LIBC_MSVCRT
 #undef HAVE_LIBC_MSVCRT
 #endif
@@ -1421,20 +1473,24 @@
 #undef HAVE_VDPAU_X11
 #endif
 #define HAVE_VDPAU_X11 0
+#ifdef HAVE_WINRT
+#undef HAVE_WINRT
+#endif
+#define HAVE_WINRT 0
 #ifdef HAVE_XLIB
 #undef HAVE_XLIB
 #endif
 #define HAVE_XLIB 0
 #define CONFIG_BSFS 1
 #define CONFIG_DECODERS 1
-#define CONFIG_DEMUXERS 1
 #define CONFIG_ENCODERS 1
-#define CONFIG_FILTERS 0
 #define CONFIG_HWACCELS 0
+#define CONFIG_PARSERS 1
 #define CONFIG_INDEVS 0
-#define CONFIG_MUXERS 1
 #define CONFIG_OUTDEVS 0
-#define CONFIG_PARSERS 1
+#define CONFIG_FILTERS 0
+#define CONFIG_DEMUXERS 1
+#define CONFIG_MUXERS 1
 #define CONFIG_PROTOCOLS 1
 #define CONFIG_DOC 0
 #define CONFIG_HTMLPAGES 0
@@ -1459,13 +1515,15 @@
 #define CONFIG_TRANSCODING_EXAMPLE 1
 #define CONFIG_AVISYNTH 0
 #define CONFIG_BZLIB 0
+#define CONFIG_CHROMAPRINT 0
 #define CONFIG_CRYSTALHD 0
 #define CONFIG_DECKLINK 0
 #define CONFIG_FREI0R 0
+#define CONFIG_GCRYPT 0
+#define CONFIG_GMP 0
 #define CONFIG_GNUTLS 0
 #define CONFIG_ICONV 0
 #define CONFIG_LADSPA 0
-#define CONFIG_LIBAACPLUS 0
 #define CONFIG_LIBASS 0
 #define CONFIG_LIBBLURAY 0
 #define CONFIG_LIBBS2B 0
@@ -1496,8 +1554,8 @@
 #define CONFIG_LIBOPENJPEG 0
 #define CONFIG_LIBOPUS 0
 #define CONFIG_LIBPULSE 0
-#define CONFIG_LIBQUVI 0
 #define CONFIG_LIBRTMP 0
+#define CONFIG_LIBRUBBERBAND 0
 #define CONFIG_LIBSCHROEDINGER 0
 #define CONFIG_LIBSHINE 0
 #define CONFIG_LIBSMBCLIENT 0
@@ -1505,13 +1563,12 @@
 #define CONFIG_LIBSOXR 0
 #define CONFIG_LIBSPEEX 0
 #define CONFIG_LIBSSH 0
-#define CONFIG_LIBSTAGEFRIGHT_H264 0
+#define CONFIG_LIBTESSERACT 0
 #define CONFIG_LIBTHEORA 0
 #define CONFIG_LIBTWOLAME 0
 #define CONFIG_LIBUTVIDEO 0
 #define CONFIG_LIBV4L2 0
 #define CONFIG_LIBVIDSTAB 0
-#define CONFIG_LIBVO_AACENC 0
 #define CONFIG_LIBVO_AMRWBENC 0
 #define CONFIG_LIBVORBIS 0
 #define CONFIG_LIBVPX 0
@@ -1525,15 +1582,18 @@
 #define CONFIG_LIBXCB_SHAPE 0
 #define CONFIG_LIBXCB_XFIXES 0
 #define CONFIG_LIBXVID 0
+#define CONFIG_LIBZIMG 0
 #define CONFIG_LIBZMQ 0
 #define CONFIG_LIBZVBI 0
 #define CONFIG_LZMA 0
 #define CONFIG_MMAL 0
+#define CONFIG_NETCDF 0
 #define CONFIG_NVENC 0
 #define CONFIG_OPENAL 0
 #define CONFIG_OPENCL 0
 #define CONFIG_OPENGL 0
 #define CONFIG_OPENSSL 0
+#define CONFIG_SCHANNEL 0
 #define CONFIG_SDL 0
 #define CONFIG_SECURETRANSPORT 0
 #define CONFIG_X11GRAB 0
@@ -1601,6 +1661,7 @@
 #define CONFIG_BLOCKDSP 1
 #define CONFIG_BSWAPDSP 1
 #define CONFIG_CABAC 1
+#define CONFIG_DIRAC_PARSE 1
 #define CONFIG_DVPROFILE 1
 #define CONFIG_EXIF 1
 #define CONFIG_FAANDCT 1
@@ -1610,8 +1671,6 @@
 #define CONFIG_FMTCONVERT 1
 #define CONFIG_FRAME_THREAD_ENCODER 1
 #define CONFIG_G722DSP 1
-#define CONFIG_GCRYPT 0
-#define CONFIG_GMP 0
 #define CONFIG_GOLOMB 1
 #define CONFIG_GPLV3 0
 #define CONFIG_H263DSP 1
@@ -1629,11 +1688,12 @@
 #define CONFIG_INTRAX8 1
 #define CONFIG_IVIDSP 1
 #define CONFIG_JPEGTABLES 1
-#define CONFIG_LIBX262 0
 #define CONFIG_LGPLV3 0
+#define CONFIG_LIBX262 0
 #define CONFIG_LLAUDDSP 1
 #define CONFIG_LLVIDDSP 1
 #define CONFIG_LPC 1
+#define CONFIG_LZF 1
 #define CONFIG_ME_CMP 1
 #define CONFIG_MPEG_ER 1
 #define CONFIG_MPEGAUDIO 1
@@ -1704,6 +1764,7 @@
 #define CONFIG_CAVS_DECODER 1
 #define CONFIG_CDGRAPHICS_DECODER 1
 #define CONFIG_CDXL_DECODER 1
+#define CONFIG_CFHD_DECODER 1
 #define CONFIG_CINEPAK_DECODER 1
 #define CONFIG_CLJR_DECODER 1
 #define CONFIG_CLLC_DECODER 1
@@ -1717,9 +1778,11 @@
 #define CONFIG_DNXHD_DECODER 1
 #define CONFIG_DPX_DECODER 1
 #define CONFIG_DSICINVIDEO_DECODER 1
+#define CONFIG_DVAUDIO_DECODER 1
 #define CONFIG_DVVIDEO_DECODER 1
 #define CONFIG_DXA_DECODER 1
 #define CONFIG_DXTORY_DECODER 1
+#define CONFIG_DXV_DECODER 1
 #define CONFIG_EACMV_DECODER 1
 #define CONFIG_EAMAD_DECODER 1
 #define CONFIG_EATGQ_DECODER 1
@@ -1761,7 +1824,6 @@
 #define CONFIG_HQX_DECODER 1
 #define CONFIG_HUFFYUV_DECODER 1
 #define CONFIG_IDCIN_DECODER 1
-#define CONFIG_IFF_BYTERUN1_DECODER 1
 #define CONFIG_IFF_ILBM_DECODER 1
 #define CONFIG_INDEO2_DECODER 1
 #define CONFIG_INDEO3_DECODER 1
@@ -1786,10 +1848,12 @@
 #define CONFIG_MPEG2VIDEO_DECODER 1
 #define CONFIG_MPEG4_DECODER 1
 #define CONFIG_MPEG4_CRYSTALHD_DECODER 0
+#define CONFIG_MPEG4_MMAL_DECODER 0
 #define CONFIG_MPEG4_VDPAU_DECODER 0
 #define CONFIG_MPEGVIDEO_DECODER 1
 #define CONFIG_MPEG_VDPAU_DECODER 0
 #define CONFIG_MPEG1_VDPAU_DECODER 0
+#define CONFIG_MPEG2_MMAL_DECODER 0
 #define CONFIG_MPEG2_CRYSTALHD_DECODER 0
 #define CONFIG_MPEG2_QSV_DECODER 0
 #define CONFIG_MSA1_DECODER 1
@@ -1828,12 +1892,15 @@
 #define CONFIG_RL2_DECODER 1
 #define CONFIG_ROQ_DECODER 1
 #define CONFIG_RPZA_DECODER 1
+#define CONFIG_RSCC_DECODER 1
 #define CONFIG_RV10_DECODER 1
 #define CONFIG_RV20_DECODER 1
 #define CONFIG_RV30_DECODER 1
 #define CONFIG_RV40_DECODER 1
 #define CONFIG_S302M_DECODER 1
 #define CONFIG_SANM_DECODER 1
+#define CONFIG_SCREENPRESSO_DECODER 1
+#define CONFIG_SDX2_DPCM_DECODER 1
 #define CONFIG_SGI_DECODER 1
 #define CONFIG_SGIRLE_DECODER 1
 #define CONFIG_SMACKER_DECODER 1
@@ -1870,6 +1937,7 @@
 #define CONFIG_VC1_CRYSTALHD_DECODER 0
 #define CONFIG_VC1_VDPAU_DECODER 0
 #define CONFIG_VC1IMAGE_DECODER 1
+#define CONFIG_VC1_MMAL_DECODER 0
 #define CONFIG_VC1_QSV_DECODER 0
 #define CONFIG_VCR1_DECODER 1
 #define CONFIG_VMDVIDEO_DECODER 1
@@ -1938,6 +2006,7 @@
 #define CONFIG_GSM_MS_DECODER 1
 #define CONFIG_IAC_DECODER 1
 #define CONFIG_IMC_DECODER 1
+#define CONFIG_INTERPLAY_ACM_DECODER 1
 #define CONFIG_MACE3_DECODER 1
 #define CONFIG_MACE6_DECODER 1
 #define CONFIG_METASOUND_DECODER 1
@@ -1981,6 +2050,8 @@
 #define CONFIG_WMAV2_DECODER 1
 #define CONFIG_WMAVOICE_DECODER 1
 #define CONFIG_WS_SND1_DECODER 1
+#define CONFIG_XMA1_DECODER 1
+#define CONFIG_XMA2_DECODER 1
 #define CONFIG_PCM_ALAW_DECODER 1
 #define CONFIG_PCM_BLURAY_DECODER 1
 #define CONFIG_PCM_DVD_DECODER 1
@@ -2018,6 +2089,7 @@
 #define CONFIG_ADPCM_4XM_DECODER 1
 #define CONFIG_ADPCM_ADX_DECODER 1
 #define CONFIG_ADPCM_AFC_DECODER 1
+#define CONFIG_ADPCM_AICA_DECODER 1
 #define CONFIG_ADPCM_CT_DECODER 1
 #define CONFIG_ADPCM_DTK_DECODER 1
 #define CONFIG_ADPCM_EA_DECODER 1
@@ -2043,6 +2115,7 @@
 #define CONFIG_ADPCM_IMA_WAV_DECODER 1
 #define CONFIG_ADPCM_IMA_WS_DECODER 1
 #define CONFIG_ADPCM_MS_DECODER 1
+#define CONFIG_ADPCM_PSX_DECODER 1
 #define CONFIG_ADPCM_SBPRO_2_DECODER 1
 #define CONFIG_ADPCM_SBPRO_3_DECODER 1
 #define CONFIG_ADPCM_SBPRO_4_DECODER 1
@@ -2052,7 +2125,6 @@
 #define CONFIG_ADPCM_VIMA_DECODER 1
 #define CONFIG_ADPCM_XA_DECODER 1
 #define CONFIG_ADPCM_YAMAHA_DECODER 1
-#define CONFIG_VIMA_DECODER 1
 #define CONFIG_SSA_DECODER 1
 #define CONFIG_ASS_DECODER 0
 #define CONFIG_CCAPTION_DECODER 1
@@ -2087,7 +2159,6 @@
 #define CONFIG_LIBOPUS_DECODER 0
 #define CONFIG_LIBSCHROEDINGER_DECODER 0
 #define CONFIG_LIBSPEEX_DECODER 0
-#define CONFIG_LIBSTAGEFRIGHT_H264_DECODER 0
 #define CONFIG_LIBUTVIDEO_DECODER 0
 #define CONFIG_LIBVORBIS_DECODER 0
 #define CONFIG_LIBVPX_VP8_DECODER 0
@@ -2099,9 +2170,11 @@
 #define CONFIG_AA_DEMUXER 1
 #define CONFIG_AAC_DEMUXER 1
 #define CONFIG_AC3_DEMUXER 1
+#define CONFIG_ACM_DEMUXER 1
 #define CONFIG_ACT_DEMUXER 1
 #define CONFIG_ADF_DEMUXER 1
 #define CONFIG_ADP_DEMUXER 1
+#define CONFIG_ADS_DEMUXER 1
 #define CONFIG_ADX_DEMUXER 1
 #define CONFIG_AEA_DEMUXER 1
 #define CONFIG_AFC_DEMUXER 1
@@ -2139,6 +2212,7 @@
 #define CONFIG_CONCAT_DEMUXER 1
 #define CONFIG_DATA_DEMUXER 1
 #define CONFIG_DAUD_DEMUXER 1
+#define CONFIG_DCSTR_DEMUXER 1
 #define CONFIG_DFA_DEMUXER 1
 #define CONFIG_DIRAC_DEMUXER 1
 #define CONFIG_DNXHD_DEMUXER 1
@@ -2163,9 +2237,11 @@
 #define CONFIG_LIVE_FLV_DEMUXER 1
 #define CONFIG_FOURXM_DEMUXER 1
 #define CONFIG_FRM_DEMUXER 1
+#define CONFIG_FSB_DEMUXER 1
 #define CONFIG_G722_DEMUXER 1
 #define CONFIG_G723_1_DEMUXER 1
 #define CONFIG_G729_DEMUXER 1
+#define CONFIG_GENH_DEMUXER 1
 #define CONFIG_GIF_DEMUXER 1
 #define CONFIG_GSM_DEMUXER 1
 #define CONFIG_GXF_DEMUXER 1
@@ -2190,9 +2266,9 @@
 #define CONFIG_ISS_DEMUXER 1
 #define CONFIG_IV8_DEMUXER 1
 #define CONFIG_IVF_DEMUXER 1
+#define CONFIG_IVR_DEMUXER 1
 #define CONFIG_JACOSUB_DEMUXER 0
 #define CONFIG_JV_DEMUXER 1
-#define CONFIG_LATM_DEMUXER 1
 #define CONFIG_LMLM4_DEMUXER 1
 #define CONFIG_LOAS_DEMUXER 1
 #define CONFIG_LRC_DEMUXER 1
@@ -2218,6 +2294,7 @@
 #define CONFIG_MPJPEG_DEMUXER 1
 #define CONFIG_MPL2_DEMUXER 0
 #define CONFIG_MPSUB_DEMUXER 1
+#define CONFIG_MSF_DEMUXER 1
 #define CONFIG_MSNWC_TCP_DEMUXER 1
 #define CONFIG_MTV_DEMUXER 1
 #define CONFIG_MV_DEMUXER 1
@@ -2290,22 +2367,28 @@
 #define CONFIG_SUBVIEWER1_DEMUXER 0
 #define CONFIG_SUBVIEWER_DEMUXER 0
 #define CONFIG_SUP_DEMUXER 1
+#define CONFIG_SVAG_DEMUXER 1
 #define CONFIG_SWF_DEMUXER 1
 #define CONFIG_TAK_DEMUXER 1
 #define CONFIG_TEDCAPTIONS_DEMUXER 1
 #define CONFIG_THP_DEMUXER 1
+#define CONFIG_THREEDOSTR_DEMUXER 1
 #define CONFIG_TIERTEXSEQ_DEMUXER 1
 #define CONFIG_TMV_DEMUXER 1
 #define CONFIG_TRUEHD_DEMUXER 1
 #define CONFIG_TTA_DEMUXER 1
 #define CONFIG_TXD_DEMUXER 1
 #define CONFIG_TTY_DEMUXER 1
+#define CONFIG_V210_DEMUXER 1
+#define CONFIG_V210X_DEMUXER 1
+#define CONFIG_VAG_DEMUXER 1
 #define CONFIG_VC1_DEMUXER 1
 #define CONFIG_VC1T_DEMUXER 1
 #define CONFIG_VIVO_DEMUXER 1
 #define CONFIG_VMD_DEMUXER 1
 #define CONFIG_VOBSUB_DEMUXER 1
 #define CONFIG_VOC_DEMUXER 1
+#define CONFIG_VPK_DEMUXER 1
 #define CONFIG_VPLAYER_DEMUXER 0
 #define CONFIG_VQF_DEMUXER 1
 #define CONFIG_W64_DEMUXER 1
@@ -2316,10 +2399,12 @@
 #define CONFIG_WSAUD_DEMUXER 1
 #define CONFIG_WSVQA_DEMUXER 1
 #define CONFIG_WTV_DEMUXER 1
+#define CONFIG_WVE_DEMUXER 1
 #define CONFIG_WV_DEMUXER 1
 #define CONFIG_XA_DEMUXER 1
 #define CONFIG_XBIN_DEMUXER 1
 #define CONFIG_XMV_DEMUXER 1
+#define CONFIG_XVAG_DEMUXER 1
 #define CONFIG_XWMA_DEMUXER 1
 #define CONFIG_YOP_DEMUXER 1
 #define CONFIG_YUV4MPEGPIPE_DEMUXER 1
@@ -2340,7 +2425,6 @@
 #define CONFIG_LIBGME_DEMUXER 0
 #define CONFIG_LIBMODPLUG_DEMUXER 0
 #define CONFIG_LIBNUT_DEMUXER 0
-#define CONFIG_LIBQUVI_DEMUXER 0
 #define CONFIG_A64MULTI_ENCODER 1
 #define CONFIG_A64MULTI5_ENCODER 1
 #define CONFIG_ALIAS_PIX_ENCODER 1
@@ -2408,6 +2492,8 @@
 #define CONFIG_V308_ENCODER 1
 #define CONFIG_V408_ENCODER 1
 #define CONFIG_V410_ENCODER 1
+#define CONFIG_VC2_ENCODER 1
+#define CONFIG_WRAPPED_AVFRAME_ENCODER 1
 #define CONFIG_WMV1_ENCODER 1
 #define CONFIG_WMV2_ENCODER 1
 #define CONFIG_XBM_ENCODER 1
@@ -2478,6 +2564,7 @@
 #define CONFIG_MOVTEXT_ENCODER 1
 #define CONFIG_SRT_ENCODER 1
 #define CONFIG_SUBRIP_ENCODER 1
+#define CONFIG_TEXT_ENCODER 1
 #define CONFIG_WEBVTT_ENCODER 1
 #define CONFIG_XSUB_ENCODER 1
 #define CONFIG_LIBFAAC_ENCODER 0
@@ -2495,7 +2582,6 @@
 #define CONFIG_LIBTHEORA_ENCODER 0
 #define CONFIG_LIBTWOLAME_ENCODER 0
 #define CONFIG_LIBUTVIDEO_ENCODER 0
-#define CONFIG_LIBVO_AACENC_ENCODER 0
 #define CONFIG_LIBVO_AMRWBENC_ENCODER 0
 #define CONFIG_LIBVORBIS_ENCODER 0
 #define CONFIG_LIBVPX_VP8_ENCODER 0
@@ -2509,7 +2595,6 @@
 #define CONFIG_LIBX265_ENCODER 0
 #define CONFIG_LIBXAVS_ENCODER 0
 #define CONFIG_LIBXVID_ENCODER 0
-#define CONFIG_LIBAACPLUS_ENCODER 0
 #define CONFIG_LIBOPENH264_ENCODER 0
 #define CONFIG_H264_QSV_ENCODER 0
 #define CONFIG_NVENC_ENCODER 0
@@ -2518,20 +2603,29 @@
 #define CONFIG_HEVC_QSV_ENCODER 0
 #define CONFIG_LIBKVAZAAR_ENCODER 0
 #define CONFIG_MPEG2_QSV_ENCODER 0
+#define CONFIG_ACOMPRESSOR_FILTER 0
 #define CONFIG_ACROSSFADE_FILTER 0
 #define CONFIG_ADELAY_FILTER 0
 #define CONFIG_AECHO_FILTER 0
+#define CONFIG_AEMPHASIS_FILTER 0
 #define CONFIG_AEVAL_FILTER 0
 #define CONFIG_AFADE_FILTER 0
+#define CONFIG_AFFTFILT_FILTER 0
 #define CONFIG_AFORMAT_FILTER 0
+#define CONFIG_AGATE_FILTER 0
 #define CONFIG_AINTERLEAVE_FILTER 0
+#define CONFIG_ALIMITER_FILTER 0
 #define CONFIG_ALLPASS_FILTER 0
 #define CONFIG_AMERGE_FILTER 0
+#define CONFIG_AMETADATA_FILTER 0
 #define CONFIG_AMIX_FILTER 0
+#define CONFIG_ANEQUALIZER_FILTER 0
 #define CONFIG_ANULL_FILTER 0
 #define CONFIG_APAD_FILTER 0
 #define CONFIG_APERMS_FILTER 0
 #define CONFIG_APHASER_FILTER 0
+#define CONFIG_APULSATOR_FILTER 0
+#define CONFIG_AREALTIME_FILTER 0
 #define CONFIG_ARESAMPLE_FILTER 0
 #define CONFIG_AREVERSE_FILTER 0
 #define CONFIG_ASELECT_FILTER 0
@@ -2543,7 +2637,7 @@
 #define CONFIG_ASHOWINFO_FILTER 0
 #define CONFIG_ASPLIT_FILTER 0
 #define CONFIG_ASTATS_FILTER 0
-#define CONFIG_ASTREAMSYNC_FILTER 0
+#define CONFIG_ASTREAMSELECT_FILTER 0
 #define CONFIG_ASYNCTS_FILTER 0
 #define CONFIG_ATEMPO_FILTER 0
 #define CONFIG_ATRIM_FILTER 0
@@ -2557,11 +2651,13 @@
 #define CONFIG_CHANNELSPLIT_FILTER 0
 #define CONFIG_CHORUS_FILTER 0
 #define CONFIG_COMPAND_FILTER 0
+#define CONFIG_COMPENSATIONDELAY_FILTER 0
 #define CONFIG_DCSHIFT_FILTER 0
 #define CONFIG_DYNAUDNORM_FILTER 0
 #define CONFIG_EARWAX_FILTER 0
 #define CONFIG_EBUR128_FILTER 0
 #define CONFIG_EQUALIZER_FILTER 0
+#define CONFIG_EXTRASTEREO_FILTER 0
 #define CONFIG_FLANGER_FILTER 0
 #define CONFIG_HIGHPASS_FILTER 0
 #define CONFIG_JOIN_FILTER 0
@@ -2570,13 +2666,21 @@
 #define CONFIG_PAN_FILTER 0
 #define CONFIG_REPLAYGAIN_FILTER 0
 #define CONFIG_RESAMPLE_FILTER 0
+#define CONFIG_RUBBERBAND_FILTER 0
 #define CONFIG_SIDECHAINCOMPRESS_FILTER 0
+#define CONFIG_SIDECHAINGATE_FILTER 0
 #define CONFIG_SILENCEDETECT_FILTER 0
 #define CONFIG_SILENCEREMOVE_FILTER 0
+#define CONFIG_SOFALIZER_FILTER 0
+#define CONFIG_STEREOTOOLS_FILTER 0
+#define CONFIG_STEREOWIDEN_FILTER 0
 #define CONFIG_TREBLE_FILTER 0
+#define CONFIG_TREMOLO_FILTER 0
+#define CONFIG_VIBRATO_FILTER 0
 #define CONFIG_VOLUME_FILTER 0
 #define CONFIG_VOLUMEDETECT_FILTER 0
 #define CONFIG_AEVALSRC_FILTER 0
+#define CONFIG_ANOISESRC_FILTER 0
 #define CONFIG_ANULLSRC_FILTER 0
 #define CONFIG_FLITE_FILTER 0
 #define CONFIG_SINE_FILTER 0
@@ -2590,12 +2694,14 @@
 #define CONFIG_BLACKFRAME_FILTER 0
 #define CONFIG_BLEND_FILTER 0
 #define CONFIG_BOXBLUR_FILTER 0
+#define CONFIG_CHROMAKEY_FILTER 0
 #define CONFIG_CODECVIEW_FILTER 0
 #define CONFIG_COLORBALANCE_FILTER 0
 #define CONFIG_COLORCHANNELMIXER_FILTER 0
 #define CONFIG_COLORKEY_FILTER 0
 #define CONFIG_COLORLEVELS_FILTER 0
 #define CONFIG_COLORMATRIX_FILTER 0
+#define CONFIG_CONVOLUTION_FILTER 0
 #define CONFIG_COPY_FILTER 0
 #define CONFIG_COVER_RECT_FILTER 0
 #define CONFIG_CROP_FILTER 0
@@ -2610,6 +2716,7 @@
 #define CONFIG_DESHAKE_FILTER 0
 #define CONFIG_DETELECINE_FILTER 0
 #define CONFIG_DILATION_FILTER 0
+#define CONFIG_DISPLACE_FILTER 0
 #define CONFIG_DRAWBOX_FILTER 0
 #define CONFIG_DRAWGRAPH_FILTER 0
 #define CONFIG_DRAWGRID_FILTER 0
@@ -2653,13 +2760,17 @@
 #define CONFIG_LUT_FILTER 0
 #define CONFIG_LUTRGB_FILTER 0
 #define CONFIG_LUTYUV_FILTER 0
+#define CONFIG_MASKEDMERGE_FILTER 0
 #define CONFIG_MCDEINT_FILTER 0
 #define CONFIG_MERGEPLANES_FILTER 0
+#define CONFIG_METADATA_FILTER 0
 #define CONFIG_MPDECIMATE_FILTER 0
 #define CONFIG_NEGATE_FILTER 0
+#define CONFIG_NNEDI_FILTER 0
 #define CONFIG_NOFORMAT_FILTER 0
 #define CONFIG_NOISE_FILTER 0
 #define CONFIG_NULL_FILTER 0
+#define CONFIG_OCR_FILTER 0
 #define CONFIG_OCV_FILTER 0
 #define CONFIG_OVERLAY_FILTER 0
 #define CONFIG_OWDENOISE_FILTER 0
@@ -2676,6 +2787,7 @@
 #define CONFIG_PULLUP_FILTER 0
 #define CONFIG_QP_FILTER 0
 #define CONFIG_RANDOM_FILTER 0
+#define CONFIG_REALTIME_FILTER 0
 #define CONFIG_REMOVEGRAIN_FILTER 0
 #define CONFIG_REMOVELOGO_FILTER 0
 #define CONFIG_REPEATFIELDS_FILTER 0
@@ -2685,6 +2797,7 @@
 #define CONFIG_SCALE_FILTER 0
 #define CONFIG_SCALE2REF_FILTER 0
 #define CONFIG_SELECT_FILTER 0
+#define CONFIG_SELECTIVECOLOR_FILTER 0
 #define CONFIG_SENDCMD_FILTER 0
 #define CONFIG_SEPARATEFIELDS_FILTER 0
 #define CONFIG_SETDAR_FILTER 0
@@ -2694,6 +2807,7 @@
 #define CONFIG_SETTB_FILTER 0
 #define CONFIG_SHOWINFO_FILTER 0
 #define CONFIG_SHOWPALETTE_FILTER 0
+#define CONFIG_SHUFFLEFRAMES_FILTER 0
 #define CONFIG_SHUFFLEPLANES_FILTER 0
 #define CONFIG_SIGNALSTATS_FILTER 0
 #define CONFIG_SMARTBLUR_FILTER 0
@@ -2701,8 +2815,10 @@
 #define CONFIG_SPP_FILTER 0
 #define CONFIG_SSIM_FILTER 0
 #define CONFIG_STEREO3D_FILTER 0
+#define CONFIG_STREAMSELECT_FILTER 0
 #define CONFIG_SUBTITLES_FILTER 0
 #define CONFIG_SUPER2XSAI_FILTER 0
+#define CONFIG_SWAPRECT_FILTER 0
 #define CONFIG_SWAPUV_FILTER 0
 #define CONFIG_TBLEND_FILTER 0
 #define CONFIG_TELECINE_FILTER 0
@@ -2725,6 +2841,7 @@
 #define CONFIG_YADIF_FILTER 0
 #define CONFIG_ZMQ_FILTER 0
 #define CONFIG_ZOOMPAN_FILTER 0
+#define CONFIG_ZSCALE_FILTER 0
 #define CONFIG_ALLRGB_FILTER 0
 #define CONFIG_ALLYUV_FILTER 0
 #define CONFIG_CELLAUTO_FILTER 0
@@ -2739,21 +2856,24 @@
 #define CONFIG_SMPTEBARS_FILTER 0
 #define CONFIG_SMPTEHDBARS_FILTER 0
 #define CONFIG_TESTSRC_FILTER 0
+#define CONFIG_TESTSRC2_FILTER 0
 #define CONFIG_NULLSINK_FILTER 0
 #define CONFIG_ADRAWGRAPH_FILTER 0
+#define CONFIG_AHISTOGRAM_FILTER 0
 #define CONFIG_APHASEMETER_FILTER 0
 #define CONFIG_AVECTORSCOPE_FILTER 0
 #define CONFIG_CONCAT_FILTER 0
 #define CONFIG_SHOWCQT_FILTER 0
 #define CONFIG_SHOWFREQS_FILTER 0
 #define CONFIG_SHOWSPECTRUM_FILTER 0
+#define CONFIG_SHOWSPECTRUMPIC_FILTER 0
 #define CONFIG_SHOWVOLUME_FILTER 0
 #define CONFIG_SHOWWAVES_FILTER 0
 #define CONFIG_SHOWWAVESPIC_FILTER 0
+#define CONFIG_SPECTRUMSYNTH_FILTER 0
 #define CONFIG_AMOVIE_FILTER 0
 #define CONFIG_MOVIE_FILTER 0
 #define CONFIG_H263_VAAPI_HWACCEL 0
-#define CONFIG_H263_VDPAU_HWACCEL 0
 #define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0
 #define CONFIG_H264_D3D11VA_HWACCEL 0
 #define CONFIG_H264_DXVA2_HWACCEL 0
@@ -2775,10 +2895,12 @@
 #define CONFIG_MPEG2_XVMC_HWACCEL 0
 #define CONFIG_MPEG2_D3D11VA_HWACCEL 0
 #define CONFIG_MPEG2_DXVA2_HWACCEL 0
+#define CONFIG_MPEG2_MMAL_HWACCEL 0
 #define CONFIG_MPEG2_QSV_HWACCEL 0
 #define CONFIG_MPEG2_VAAPI_HWACCEL 0
 #define CONFIG_MPEG2_VDPAU_HWACCEL 0
 #define CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL 0
+#define CONFIG_MPEG4_MMAL_HWACCEL 0
 #define CONFIG_MPEG4_VAAPI_HWACCEL 0
 #define CONFIG_MPEG4_VDPAU_HWACCEL 0
 #define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
@@ -2786,7 +2908,11 @@
 #define CONFIG_VC1_DXVA2_HWACCEL 0
 #define CONFIG_VC1_VAAPI_HWACCEL 0
 #define CONFIG_VC1_VDPAU_HWACCEL 0
+#define CONFIG_VC1_MMAL_HWACCEL 0
 #define CONFIG_VC1_QSV_HWACCEL 0
+#define CONFIG_VP9_D3D11VA_HWACCEL 0
+#define CONFIG_VP9_DXVA2_HWACCEL 0
+#define CONFIG_VP9_VAAPI_HWACCEL 0
 #define CONFIG_WMV3_D3D11VA_HWACCEL 0
 #define CONFIG_WMV3_DXVA2_HWACCEL 0
 #define CONFIG_WMV3_VAAPI_HWACCEL 0
@@ -2956,6 +3082,7 @@
 #define CONFIG_WTV_MUXER 1
 #define CONFIG_WV_MUXER 1
 #define CONFIG_YUV4MPEGPIPE_MUXER 1
+#define CONFIG_CHROMAPRINT_MUXER 0
 #define CONFIG_LIBNUT_MUXER 0
 #define CONFIG_ALSA_OUTDEV 0
 #define CONFIG_CACA_OUTDEV 0
@@ -2979,6 +3106,7 @@
 #define CONFIG_DIRAC_PARSER 1
 #define CONFIG_DNXHD_PARSER 1
 #define CONFIG_DPX_PARSER 1
+#define CONFIG_DVAUDIO_PARSER 1
 #define CONFIG_DVBSUB_PARSER 1
 #define CONFIG_DVDSUB_PARSER 1
 #define CONFIG_DVD_NAV_PARSER 1
@@ -3036,6 +3164,7 @@
 #define CONFIG_SRTP_PROTOCOL 1
 #define CONFIG_SUBFILE_PROTOCOL 1
 #define CONFIG_TCP_PROTOCOL 1
+#define CONFIG_TLS_SCHANNEL_PROTOCOL 0
 #define CONFIG_TLS_SECURETRANSPORT_PROTOCOL 0
 #define CONFIG_TLS_GNUTLS_PROTOCOL 0
 #define CONFIG_TLS_OPENSSL_PROTOCOL 0