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

Change-Id: If99ca4a37ff6c1781acaa0f7d57dead7b54a5931

13 files changed, 2189 insertions, 770 deletions

diff --git a/android/config-armv5te.mak b/android/config-armv5te.mak
index cb496d02de..fbb57ee4bc 100644
--- a/android/config-armv5te.mak
+++ b/android/config-armv5te.mak
@@ -12,6 +12,7 @@ DOCDIR=$(DESTDIR)${prefix}/share/doc/ffmpeg
 MANDIR=$(DESTDIR)${prefix}/share/man
 PKGCONFIGDIR=$(DESTDIR)${prefix}/lib/pkgconfig
 SRC_PATH=.
+SRC_LINK=.
 ifndef MAIN_MAKEFILE
 SRC_PATH:=$(SRC_PATH:.%=..%)
 endif
@@ -21,6 +22,7 @@ INTRINSICS=none
 CC=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-gcc
 CXX=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-g++
 AS=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-gcc
+OBJCC=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-gcc
 LD=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-gcc
 DEPCC=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-gcc
 DEPCCFLAGS= $(CPPFLAGS)
@@ -38,9 +40,13 @@ LN_S=ln -s -f
 CPPFLAGS= --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-arm -isysroot ../../prebuilts/ndk/current/platforms/android-21/arch-arm -D_ISOC99_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Dstrtod=avpriv_strtod -DPIC -DZLIB_CONST
 CFLAGS=   -march=armv5te -std=c99 -fomit-frame-pointer -fPIC -marm -pthread -Wdeclaration-after-statement -Wall -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wwrite-strings -Wtype-limits -Wundef -Wmissing-prototypes -Wno-pointer-to-int-cast -Wstrict-prototypes -Wempty-body -Wno-parentheses -Wno-switch -Wno-format-zero-length -Wno-pointer-sign -O3 -fno-math-errno -fno-signed-zeros -fno-tree-vectorize -Werror=format-security -Werror=implicit-function-declaration -Werror=missing-prototypes -Werror=return-type -Werror=vla -Wformat -fdiagnostics-color=auto -Wno-maybe-uninitialized
 CXXFLAGS=  -D__STDC_CONSTANT_MACROS
+OBJCFLAGS=
 ASFLAGS=   -march=armv5te -fPIC
 AS_C=-c
 AS_O=-o $@
+OBJCC_C=-c
+OBJCC_E=-E -o $@
+OBJCC_O=-o $@
 CC_C=-c
 CC_E=-E -o $@
 CC_O=-o $@
@@ -53,7 +59,7 @@ DLLTOOL=
 WINDRES=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-windres
 DEPWINDRES=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-gcc
 DOXYGEN=doxygen
-LDFLAGS=  --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-arm -isysroot ../../prebuilts/ndk/current/platforms/android-21/arch-arm -Wl,--as-needed -Wl,-z,noexecstack -Wl,--warn-common -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample
+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
 LDEXEFLAGS=
 LDLIBFLAGS=
 SHFLAGS=-shared -Wl,-soname,$$(@F) -Wl,-Bsymbolic -Wl,--version-script,$(SUBDIR)lib$(NAME).ver
@@ -69,13 +75,13 @@ SLIBPREF=lib
 SLIBSUF=.so
 EXESUF=
 EXTRA_VERSION=
-CCDEP=$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< | sed -e "/^\#.*/d" -e "s,^[[:space:]]*$(*F)\\.o,$(@D)/$(*F).o," > $(@:.o=.d)
+CCDEP=
 CXXDEP=
-CCDEP_FLAGS=-MM
-ASDEP=$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< | sed -e "/^\#.*/d" -e "s,^[[:space:]]*$(*F)\\.o,$(@D)/$(*F).o," > $(@:.o=.d)
-ASDEP_FLAGS=-MM
-CC_DEPFLAGS=
-AS_DEPFLAGS=
+CCDEP_FLAGS=
+ASDEP=
+ASDEP_FLAGS=
+CC_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@
+AS_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@
 HOSTCC=gcc
 HOSTLD=gcc
 HOSTCFLAGS=  -std=c99 -Wall -O3
@@ -85,13 +91,13 @@ HOSTLDFLAGS=
 HOSTLIBS=-lm
 DEPHOSTCC=gcc
 DEPHOSTCCFLAGS= $(HOSTCCFLAGS)
-HOSTCCDEP=$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< | sed -e "/^\#.*/d" -e "s,^[[:space:]]*$(*F)\\.o,$(@D)/$(*F).o," > $(@:.o=.d)
-HOSTCCDEP_FLAGS=-MM
-HOSTCC_DEPFLAGS=
+HOSTCCDEP=
+HOSTCCDEP_FLAGS=
+HOSTCC_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@
 HOSTCC_C=-c
 HOSTCC_O=-o $@
 HOSTLD_O=-o $@
-TARGET_EXEC= 
+TARGET_EXEC=
 TARGET_PATH=$(CURDIR)
 TARGET_SAMPLES=$(SAMPLES)
 CFLAGS-ffplay=
@@ -113,33 +119,33 @@ SLIB_INSTALL_EXTRA_LIB=
 SLIB_INSTALL_EXTRA_SHLIB=
 SAMPLES:=$(FATE_SAMPLES)
 NOREDZONE_FLAGS=
-libavcodec_VERSION=56.60.100
-libavcodec_VERSION_MAJOR=56
-libavcodec_VERSION_MINOR=60
-libavdevice_VERSION=56.4.100
-libavdevice_VERSION_MAJOR=56
-libavdevice_VERSION_MINOR=4
-libavfilter_VERSION=5.40.101
-libavfilter_VERSION_MAJOR=5
-libavfilter_VERSION_MINOR=40
-libavformat_VERSION=56.40.101
-libavformat_VERSION_MAJOR=56
-libavformat_VERSION_MINOR=40
-libavresample_VERSION=2.1.0
-libavresample_VERSION_MAJOR=2
-libavresample_VERSION_MINOR=1
-libavutil_VERSION=54.31.100
-libavutil_VERSION_MAJOR=54
-libavutil_VERSION_MINOR=31
-libpostproc_VERSION=53.3.100
-libpostproc_VERSION_MAJOR=53
-libpostproc_VERSION_MINOR=3
-libswresample_VERSION=1.2.101
-libswresample_VERSION_MAJOR=1
-libswresample_VERSION_MINOR=2
-libswscale_VERSION=3.1.101
-libswscale_VERSION_MAJOR=3
-libswscale_VERSION_MINOR=1
+libavcodec_VERSION=57.24.102
+libavcodec_VERSION_MAJOR=57
+libavcodec_VERSION_MINOR=24
+libavdevice_VERSION=57.0.101
+libavdevice_VERSION_MAJOR=57
+libavdevice_VERSION_MINOR=0
+libavfilter_VERSION=6.31.100
+libavfilter_VERSION_MAJOR=6
+libavfilter_VERSION_MINOR=31
+libavformat_VERSION=57.25.100
+libavformat_VERSION_MAJOR=57
+libavformat_VERSION_MINOR=25
+libavresample_VERSION=3.0.0
+libavresample_VERSION_MAJOR=3
+libavresample_VERSION_MINOR=0
+libavutil_VERSION=55.17.103
+libavutil_VERSION_MAJOR=55
+libavutil_VERSION_MINOR=17
+libpostproc_VERSION=54.0.100
+libpostproc_VERSION_MAJOR=54
+libpostproc_VERSION_MINOR=0
+libswresample_VERSION=2.0.101
+libswresample_VERSION_MAJOR=2
+libswresample_VERSION_MINOR=0
+libswscale_VERSION=4.0.100
+libswscale_VERSION_MAJOR=4
+libswscale_VERSION_MINOR=0
 avcodec_FFLIBS=swresample avutil
 avdevice_FFLIBS=avformat avcodec swresample avutil
 avfilter_FFLIBS= avutil
@@ -191,6 +197,7 @@ HAVE_SETEND=yes
 !HAVE_POWER8=yes
 !HAVE_PPC4XX=yes
 !HAVE_VSX=yes
+!HAVE_AESNI=yes
 !HAVE_AMD3DNOW=yes
 !HAVE_AMD3DNOWEXT=yes
 !HAVE_AVX=yes
@@ -210,9 +217,10 @@ HAVE_SETEND=yes
 !HAVE_I686=yes
 !HAVE_MIPSFPU=yes
 !HAVE_MIPS32R2=yes
-!HAVE_MIPS32R5=yes
+!HAVE_MIPS64R2=yes
+!HAVE_MIPS32R6=yes
 !HAVE_MIPS64R6=yes
-!HAVE_MIPSDSPR1=yes
+!HAVE_MIPSDSP=yes
 !HAVE_MIPSDSPR2=yes
 !HAVE_MSA=yes
 HAVE_LOONGSON2=yes
@@ -232,6 +240,7 @@ HAVE_VFP_EXTERNAL=yes
 !HAVE_POWER8_EXTERNAL=yes
 !HAVE_PPC4XX_EXTERNAL=yes
 !HAVE_VSX_EXTERNAL=yes
+!HAVE_AESNI_EXTERNAL=yes
 !HAVE_AMD3DNOW_EXTERNAL=yes
 !HAVE_AMD3DNOWEXT_EXTERNAL=yes
 !HAVE_AVX_EXTERNAL=yes
@@ -251,9 +260,10 @@ HAVE_VFP_EXTERNAL=yes
 !HAVE_I686_EXTERNAL=yes
 !HAVE_MIPSFPU_EXTERNAL=yes
 !HAVE_MIPS32R2_EXTERNAL=yes
-!HAVE_MIPS32R5_EXTERNAL=yes
+!HAVE_MIPS64R2_EXTERNAL=yes
+!HAVE_MIPS32R6_EXTERNAL=yes
 !HAVE_MIPS64R6_EXTERNAL=yes
-!HAVE_MIPSDSPR1_EXTERNAL=yes
+!HAVE_MIPSDSP_EXTERNAL=yes
 !HAVE_MIPSDSPR2_EXTERNAL=yes
 !HAVE_MSA_EXTERNAL=yes
 !HAVE_LOONGSON2_EXTERNAL=yes
@@ -273,6 +283,7 @@ HAVE_ARMV5TE_INLINE=yes
 !HAVE_POWER8_INLINE=yes
 !HAVE_PPC4XX_INLINE=yes
 !HAVE_VSX_INLINE=yes
+!HAVE_AESNI_INLINE=yes
 !HAVE_AMD3DNOW_INLINE=yes
 !HAVE_AMD3DNOWEXT_INLINE=yes
 !HAVE_AVX_INLINE=yes
@@ -292,9 +303,10 @@ HAVE_ARMV5TE_INLINE=yes
 !HAVE_I686_INLINE=yes
 !HAVE_MIPSFPU_INLINE=yes
 !HAVE_MIPS32R2_INLINE=yes
-!HAVE_MIPS32R5_INLINE=yes
+!HAVE_MIPS64R2_INLINE=yes
+!HAVE_MIPS32R6_INLINE=yes
 !HAVE_MIPS64R6_INLINE=yes
-!HAVE_MIPSDSPR1_INLINE=yes
+!HAVE_MIPSDSP_INLINE=yes
 !HAVE_MIPSDSPR2_INLINE=yes
 !HAVE_MSA_INLINE=yes
 !HAVE_LOONGSON2_INLINE=yes
@@ -319,6 +331,8 @@ HAVE_ATOMIC_COMPARE_EXCHANGE=yes
 !HAVE_RDTSC=yes
 HAVE_SARESTART=yes
 HAVE_SYNC_VAL_COMPARE_AND_SWAP=yes
+!HAVE_CABS=yes
+!HAVE_CEXP=yes
 HAVE_INLINE_ASM=yes
 !HAVE_SYMVER=yes
 !HAVE_YASM=yes
@@ -348,6 +362,9 @@ HAVE_DLFCN_H=yes
 !HAVE_MACHINE_IOCTL_BT848_H=yes
 !HAVE_MACHINE_IOCTL_METEOR_H=yes
 HAVE_MALLOC_H=yes
+!HAVE_OPENCV2_CORE_CORE_C_H=yes
+!HAVE_OPENJPEG_2_1_OPENJPEG_H=yes
+!HAVE_OPENJPEG_2_0_OPENJPEG_H=yes
 !HAVE_OPENJPEG_1_5_OPENJPEG_H=yes
 !HAVE_OPENGL_GL3_H=yes
 HAVE_POLL_H=yes
@@ -378,6 +395,8 @@ HAVE_ERF=yes
 HAVE_EXP2=yes
 HAVE_EXP2F=yes
 HAVE_EXPF=yes
+HAVE_HYPOT=yes
+HAVE_ISFINITE=yes
 HAVE_ISINF=yes
 HAVE_ISNAN=yes
 HAVE_LDEXPF=yes
@@ -397,6 +416,7 @@ HAVE_TRUNC=yes
 HAVE_TRUNCF=yes
 HAVE_ACCESS=yes
 !HAVE_ALIGNED_MALLOC=yes
+HAVE_ARC4RANDOM=yes
 HAVE_CLOCK_GETTIME=yes
 !HAVE_CLOSESOCKET=yes
 !HAVE_COMMANDLINETOARGVW=yes
@@ -413,7 +433,6 @@ HAVE_GETOPT=yes
 !HAVE_GETPROCESSMEMORYINFO=yes
 !HAVE_GETPROCESSTIMES=yes
 HAVE_GETRUSAGE=yes
-HAVE_GETSERVBYPORT=yes
 !HAVE_GETSYSTEMTIMEASFILETIME=yes
 HAVE_GETTIMEOFDAY=yes
 !HAVE_GLOB=yes
@@ -446,6 +465,7 @@ HAVE_STRERROR_R=yes
 HAVE_SYSCONF=yes
 !HAVE_SYSCTL=yes
 HAVE_USLEEP=yes
+!HAVE_UTGETOSTYPEFROMSTRING=yes
 !HAVE_VIRTUALALLOC=yes
 !HAVE_WGLGETPROCADDRESS=yes
 HAVE_PTHREADS=yes
@@ -462,9 +482,9 @@ HAVE_ATTRIBUTE_PACKED=yes
 HAVE_GNU_AS=yes
 !HAVE_GNU_WINDRES=yes
 !HAVE_IBM_ASM=yes
+!HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS=yes
 HAVE_INLINE_ASM_LABELS=yes
 HAVE_INLINE_ASM_NONLOCAL_LABELS=yes
-!HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS=yes
 HAVE_PRAGMA_DEPRECATED=yes
 HAVE_RSYNC_CONTIMEOUT=yes
 !HAVE_SYMVER_ASM_LABEL=yes
@@ -475,7 +495,6 @@ HAVE_SYMVER_GNU_ASM=yes
 !HAVE_CONDITION_VARIABLE_PTR=yes
 HAVE_SOCKLEN_T=yes
 HAVE_STRUCT_ADDRINFO=yes
-!HAVE_STRUCT_DCADEC_EXSS_INFO_MATRIX_ENCODING=yes
 HAVE_STRUCT_GROUP_SOURCE_REQ=yes
 HAVE_STRUCT_IP_MREQ_SOURCE=yes
 HAVE_STRUCT_IPV6_MREQ=yes
@@ -489,8 +508,8 @@ HAVE_STRUCT_SOCKADDR_STORAGE=yes
 HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE=yes
 HAVE_ATOMICS_NATIVE=yes
 !HAVE_DOS_PATHS=yes
-!HAVE_DXVA2API_COBJ=yes
 !HAVE_DXVA2_LIB=yes
+!HAVE_DXVA2API_COBJ=yes
 !HAVE_LIBC_MSVCRT=yes
 !HAVE_LIBDC1394_1=yes
 !HAVE_LIBDC1394_2=yes
@@ -504,17 +523,18 @@ HAVE_SECTION_DATA_REL_RO=yes
 HAVE_THREADS=yes
 !HAVE_VAAPI_X11=yes
 !HAVE_VDPAU_X11=yes
+!HAVE_WINRT=yes
 !HAVE_XLIB=yes
 CONFIG_BSFS=yes
 CONFIG_DECODERS=yes
-CONFIG_DEMUXERS=yes
 CONFIG_ENCODERS=yes
-!CONFIG_FILTERS=yes
 !CONFIG_HWACCELS=yes
+CONFIG_PARSERS=yes
 !CONFIG_INDEVS=yes
-CONFIG_MUXERS=yes
 !CONFIG_OUTDEVS=yes
-CONFIG_PARSERS=yes
+!CONFIG_FILTERS=yes
+CONFIG_DEMUXERS=yes
+CONFIG_MUXERS=yes
 CONFIG_PROTOCOLS=yes
 !CONFIG_DOC=yes
 !CONFIG_HTMLPAGES=yes
@@ -539,13 +559,15 @@ CONFIG_TRANSCODE_AAC_EXAMPLE=yes
 CONFIG_TRANSCODING_EXAMPLE=yes
 !CONFIG_AVISYNTH=yes
 !CONFIG_BZLIB=yes
+!CONFIG_CHROMAPRINT=yes
 !CONFIG_CRYSTALHD=yes
 !CONFIG_DECKLINK=yes
 !CONFIG_FREI0R=yes
+!CONFIG_GCRYPT=yes
+!CONFIG_GMP=yes
 !CONFIG_GNUTLS=yes
 !CONFIG_ICONV=yes
 !CONFIG_LADSPA=yes
-!CONFIG_LIBAACPLUS=yes
 !CONFIG_LIBASS=yes
 !CONFIG_LIBBLURAY=yes
 !CONFIG_LIBBS2B=yes
@@ -576,8 +598,8 @@ CONFIG_TRANSCODING_EXAMPLE=yes
 !CONFIG_LIBOPENJPEG=yes
 !CONFIG_LIBOPUS=yes
 !CONFIG_LIBPULSE=yes
-!CONFIG_LIBQUVI=yes
 !CONFIG_LIBRTMP=yes
+!CONFIG_LIBRUBBERBAND=yes
 !CONFIG_LIBSCHROEDINGER=yes
 !CONFIG_LIBSHINE=yes
 !CONFIG_LIBSMBCLIENT=yes
@@ -585,13 +607,12 @@ CONFIG_TRANSCODING_EXAMPLE=yes
 !CONFIG_LIBSOXR=yes
 !CONFIG_LIBSPEEX=yes
 !CONFIG_LIBSSH=yes
-!CONFIG_LIBSTAGEFRIGHT_H264=yes
+!CONFIG_LIBTESSERACT=yes
 !CONFIG_LIBTHEORA=yes
 !CONFIG_LIBTWOLAME=yes
 !CONFIG_LIBUTVIDEO=yes
 !CONFIG_LIBV4L2=yes
 !CONFIG_LIBVIDSTAB=yes
-!CONFIG_LIBVO_AACENC=yes
 !CONFIG_LIBVO_AMRWBENC=yes
 !CONFIG_LIBVORBIS=yes
 !CONFIG_LIBVPX=yes
@@ -605,15 +626,18 @@ CONFIG_TRANSCODING_EXAMPLE=yes
 !CONFIG_LIBXCB_SHAPE=yes
 !CONFIG_LIBXCB_XFIXES=yes
 !CONFIG_LIBXVID=yes
+!CONFIG_LIBZIMG=yes
 !CONFIG_LIBZMQ=yes
 !CONFIG_LIBZVBI=yes
 !CONFIG_LZMA=yes
 !CONFIG_MMAL=yes
+!CONFIG_NETCDF=yes
 !CONFIG_NVENC=yes
 !CONFIG_OPENAL=yes
 !CONFIG_OPENCL=yes
 !CONFIG_OPENGL=yes
 !CONFIG_OPENSSL=yes
+!CONFIG_SCHANNEL=yes
 !CONFIG_SDL=yes
 !CONFIG_SECURETRANSPORT=yes
 !CONFIG_X11GRAB=yes
@@ -681,6 +705,7 @@ CONFIG_AUDIODSP=yes
 CONFIG_BLOCKDSP=yes
 CONFIG_BSWAPDSP=yes
 CONFIG_CABAC=yes
+CONFIG_DIRAC_PARSE=yes
 CONFIG_DVPROFILE=yes
 CONFIG_EXIF=yes
 CONFIG_FAANDCT=yes
@@ -690,8 +715,6 @@ CONFIG_FLACDSP=yes
 CONFIG_FMTCONVERT=yes
 CONFIG_FRAME_THREAD_ENCODER=yes
 CONFIG_G722DSP=yes
-!CONFIG_GCRYPT=yes
-!CONFIG_GMP=yes
 CONFIG_GOLOMB=yes
 !CONFIG_GPLV3=yes
 CONFIG_H263DSP=yes
@@ -709,11 +732,12 @@ CONFIG_IMDCT15=yes
 CONFIG_INTRAX8=yes
 CONFIG_IVIDSP=yes
 CONFIG_JPEGTABLES=yes
-!CONFIG_LIBX262=yes
 !CONFIG_LGPLV3=yes
+!CONFIG_LIBX262=yes
 CONFIG_LLAUDDSP=yes
 CONFIG_LLVIDDSP=yes
 CONFIG_LPC=yes
+CONFIG_LZF=yes
 CONFIG_ME_CMP=yes
 CONFIG_MPEG_ER=yes
 CONFIG_MPEGAUDIO=yes
@@ -784,6 +808,7 @@ CONFIG_C93_DECODER=yes
 CONFIG_CAVS_DECODER=yes
 CONFIG_CDGRAPHICS_DECODER=yes
 CONFIG_CDXL_DECODER=yes
+CONFIG_CFHD_DECODER=yes
 CONFIG_CINEPAK_DECODER=yes
 CONFIG_CLJR_DECODER=yes
 CONFIG_CLLC_DECODER=yes
@@ -797,9 +822,11 @@ CONFIG_DIRAC_DECODER=yes
 CONFIG_DNXHD_DECODER=yes
 CONFIG_DPX_DECODER=yes
 CONFIG_DSICINVIDEO_DECODER=yes
+CONFIG_DVAUDIO_DECODER=yes
 CONFIG_DVVIDEO_DECODER=yes
 CONFIG_DXA_DECODER=yes
 CONFIG_DXTORY_DECODER=yes
+CONFIG_DXV_DECODER=yes
 CONFIG_EACMV_DECODER=yes
 CONFIG_EAMAD_DECODER=yes
 CONFIG_EATGQ_DECODER=yes
@@ -841,7 +868,6 @@ CONFIG_HQ_HQA_DECODER=yes
 CONFIG_HQX_DECODER=yes
 CONFIG_HUFFYUV_DECODER=yes
 CONFIG_IDCIN_DECODER=yes
-CONFIG_IFF_BYTERUN1_DECODER=yes
 CONFIG_IFF_ILBM_DECODER=yes
 CONFIG_INDEO2_DECODER=yes
 CONFIG_INDEO3_DECODER=yes
@@ -866,10 +892,12 @@ CONFIG_MPEG1VIDEO_DECODER=yes
 CONFIG_MPEG2VIDEO_DECODER=yes
 CONFIG_MPEG4_DECODER=yes
 !CONFIG_MPEG4_CRYSTALHD_DECODER=yes
+!CONFIG_MPEG4_MMAL_DECODER=yes
 !CONFIG_MPEG4_VDPAU_DECODER=yes
 CONFIG_MPEGVIDEO_DECODER=yes
 !CONFIG_MPEG_VDPAU_DECODER=yes
 !CONFIG_MPEG1_VDPAU_DECODER=yes
+!CONFIG_MPEG2_MMAL_DECODER=yes
 !CONFIG_MPEG2_CRYSTALHD_DECODER=yes
 !CONFIG_MPEG2_QSV_DECODER=yes
 CONFIG_MSA1_DECODER=yes
@@ -908,12 +936,15 @@ CONFIG_RAWVIDEO_DECODER=yes
 CONFIG_RL2_DECODER=yes
 CONFIG_ROQ_DECODER=yes
 CONFIG_RPZA_DECODER=yes
+CONFIG_RSCC_DECODER=yes
 CONFIG_RV10_DECODER=yes
 CONFIG_RV20_DECODER=yes
 CONFIG_RV30_DECODER=yes
 CONFIG_RV40_DECODER=yes
 CONFIG_S302M_DECODER=yes
 CONFIG_SANM_DECODER=yes
+CONFIG_SCREENPRESSO_DECODER=yes
+CONFIG_SDX2_DPCM_DECODER=yes
 CONFIG_SGI_DECODER=yes
 CONFIG_SGIRLE_DECODER=yes
 CONFIG_SMACKER_DECODER=yes
@@ -950,6 +981,7 @@ CONFIG_VC1_DECODER=yes
 !CONFIG_VC1_CRYSTALHD_DECODER=yes
 !CONFIG_VC1_VDPAU_DECODER=yes
 CONFIG_VC1IMAGE_DECODER=yes
+!CONFIG_VC1_MMAL_DECODER=yes
 !CONFIG_VC1_QSV_DECODER=yes
 CONFIG_VCR1_DECODER=yes
 CONFIG_VMDVIDEO_DECODER=yes
@@ -1018,6 +1050,7 @@ CONFIG_GSM_DECODER=yes
 CONFIG_GSM_MS_DECODER=yes
 CONFIG_IAC_DECODER=yes
 CONFIG_IMC_DECODER=yes
+CONFIG_INTERPLAY_ACM_DECODER=yes
 CONFIG_MACE3_DECODER=yes
 CONFIG_MACE6_DECODER=yes
 CONFIG_METASOUND_DECODER=yes
@@ -1061,6 +1094,8 @@ CONFIG_WMAV1_DECODER=yes
 CONFIG_WMAV2_DECODER=yes
 CONFIG_WMAVOICE_DECODER=yes
 CONFIG_WS_SND1_DECODER=yes
+CONFIG_XMA1_DECODER=yes
+CONFIG_XMA2_DECODER=yes
 CONFIG_PCM_ALAW_DECODER=yes
 CONFIG_PCM_BLURAY_DECODER=yes
 CONFIG_PCM_DVD_DECODER=yes
@@ -1098,6 +1133,7 @@ CONFIG_XAN_DPCM_DECODER=yes
 CONFIG_ADPCM_4XM_DECODER=yes
 CONFIG_ADPCM_ADX_DECODER=yes
 CONFIG_ADPCM_AFC_DECODER=yes
+CONFIG_ADPCM_AICA_DECODER=yes
 CONFIG_ADPCM_CT_DECODER=yes
 CONFIG_ADPCM_DTK_DECODER=yes
 CONFIG_ADPCM_EA_DECODER=yes
@@ -1123,6 +1159,7 @@ CONFIG_ADPCM_IMA_SMJPEG_DECODER=yes
 CONFIG_ADPCM_IMA_WAV_DECODER=yes
 CONFIG_ADPCM_IMA_WS_DECODER=yes
 CONFIG_ADPCM_MS_DECODER=yes
+CONFIG_ADPCM_PSX_DECODER=yes
 CONFIG_ADPCM_SBPRO_2_DECODER=yes
 CONFIG_ADPCM_SBPRO_3_DECODER=yes
 CONFIG_ADPCM_SBPRO_4_DECODER=yes
@@ -1132,7 +1169,6 @@ CONFIG_ADPCM_THP_LE_DECODER=yes
 CONFIG_ADPCM_VIMA_DECODER=yes
 CONFIG_ADPCM_XA_DECODER=yes
 CONFIG_ADPCM_YAMAHA_DECODER=yes
-CONFIG_VIMA_DECODER=yes
 CONFIG_SSA_DECODER=yes
 !CONFIG_ASS_DECODER=yes
 CONFIG_CCAPTION_DECODER=yes
@@ -1167,7 +1203,6 @@ CONFIG_XSUB_DECODER=yes
 !CONFIG_LIBOPUS_DECODER=yes
 !CONFIG_LIBSCHROEDINGER_DECODER=yes
 !CONFIG_LIBSPEEX_DECODER=yes
-!CONFIG_LIBSTAGEFRIGHT_H264_DECODER=yes
 !CONFIG_LIBUTVIDEO_DECODER=yes
 !CONFIG_LIBVORBIS_DECODER=yes
 !CONFIG_LIBVPX_VP8_DECODER=yes
@@ -1179,9 +1214,11 @@ CONFIG_IDF_DECODER=yes
 CONFIG_AA_DEMUXER=yes
 CONFIG_AAC_DEMUXER=yes
 CONFIG_AC3_DEMUXER=yes
+CONFIG_ACM_DEMUXER=yes
 CONFIG_ACT_DEMUXER=yes
 CONFIG_ADF_DEMUXER=yes
 CONFIG_ADP_DEMUXER=yes
+CONFIG_ADS_DEMUXER=yes
 CONFIG_ADX_DEMUXER=yes
 CONFIG_AEA_DEMUXER=yes
 CONFIG_AFC_DEMUXER=yes
@@ -1219,6 +1256,7 @@ CONFIG_CINE_DEMUXER=yes
 CONFIG_CONCAT_DEMUXER=yes
 CONFIG_DATA_DEMUXER=yes
 CONFIG_DAUD_DEMUXER=yes
+CONFIG_DCSTR_DEMUXER=yes
 CONFIG_DFA_DEMUXER=yes
 CONFIG_DIRAC_DEMUXER=yes
 CONFIG_DNXHD_DEMUXER=yes
@@ -1243,9 +1281,11 @@ CONFIG_FLV_DEMUXER=yes
 CONFIG_LIVE_FLV_DEMUXER=yes
 CONFIG_FOURXM_DEMUXER=yes
 CONFIG_FRM_DEMUXER=yes
+CONFIG_FSB_DEMUXER=yes
 CONFIG_G722_DEMUXER=yes
 CONFIG_G723_1_DEMUXER=yes
 CONFIG_G729_DEMUXER=yes
+CONFIG_GENH_DEMUXER=yes
 CONFIG_GIF_DEMUXER=yes
 CONFIG_GSM_DEMUXER=yes
 CONFIG_GXF_DEMUXER=yes
@@ -1270,9 +1310,9 @@ CONFIG_IRCAM_DEMUXER=yes
 CONFIG_ISS_DEMUXER=yes
 CONFIG_IV8_DEMUXER=yes
 CONFIG_IVF_DEMUXER=yes
+CONFIG_IVR_DEMUXER=yes
 !CONFIG_JACOSUB_DEMUXER=yes
 CONFIG_JV_DEMUXER=yes
-CONFIG_LATM_DEMUXER=yes
 CONFIG_LMLM4_DEMUXER=yes
 CONFIG_LOAS_DEMUXER=yes
 CONFIG_LRC_DEMUXER=yes
@@ -1298,6 +1338,7 @@ CONFIG_MPEGVIDEO_DEMUXER=yes
 CONFIG_MPJPEG_DEMUXER=yes
 !CONFIG_MPL2_DEMUXER=yes
 CONFIG_MPSUB_DEMUXER=yes
+CONFIG_MSF_DEMUXER=yes
 CONFIG_MSNWC_TCP_DEMUXER=yes
 CONFIG_MTV_DEMUXER=yes
 CONFIG_MV_DEMUXER=yes
@@ -1370,22 +1411,28 @@ CONFIG_STL_DEMUXER=yes
 !CONFIG_SUBVIEWER1_DEMUXER=yes
 !CONFIG_SUBVIEWER_DEMUXER=yes
 CONFIG_SUP_DEMUXER=yes
+CONFIG_SVAG_DEMUXER=yes
 CONFIG_SWF_DEMUXER=yes
 CONFIG_TAK_DEMUXER=yes
 CONFIG_TEDCAPTIONS_DEMUXER=yes
 CONFIG_THP_DEMUXER=yes
+CONFIG_THREEDOSTR_DEMUXER=yes
 CONFIG_TIERTEXSEQ_DEMUXER=yes
 CONFIG_TMV_DEMUXER=yes
 CONFIG_TRUEHD_DEMUXER=yes
 CONFIG_TTA_DEMUXER=yes
 CONFIG_TXD_DEMUXER=yes
 CONFIG_TTY_DEMUXER=yes
+CONFIG_V210_DEMUXER=yes
+CONFIG_V210X_DEMUXER=yes
+CONFIG_VAG_DEMUXER=yes
 CONFIG_VC1_DEMUXER=yes
 CONFIG_VC1T_DEMUXER=yes
 CONFIG_VIVO_DEMUXER=yes
 CONFIG_VMD_DEMUXER=yes
 CONFIG_VOBSUB_DEMUXER=yes
 CONFIG_VOC_DEMUXER=yes
+CONFIG_VPK_DEMUXER=yes
 !CONFIG_VPLAYER_DEMUXER=yes
 CONFIG_VQF_DEMUXER=yes
 CONFIG_W64_DEMUXER=yes
@@ -1396,10 +1443,12 @@ CONFIG_WEBVTT_DEMUXER=yes
 CONFIG_WSAUD_DEMUXER=yes
 CONFIG_WSVQA_DEMUXER=yes
 CONFIG_WTV_DEMUXER=yes
+CONFIG_WVE_DEMUXER=yes
 CONFIG_WV_DEMUXER=yes
 CONFIG_XA_DEMUXER=yes
 CONFIG_XBIN_DEMUXER=yes
 CONFIG_XMV_DEMUXER=yes
+CONFIG_XVAG_DEMUXER=yes
 CONFIG_XWMA_DEMUXER=yes
 CONFIG_YOP_DEMUXER=yes
 CONFIG_YUV4MPEGPIPE_DEMUXER=yes
@@ -1420,7 +1469,6 @@ CONFIG_IMAGE_WEBP_PIPE_DEMUXER=yes
 !CONFIG_LIBGME_DEMUXER=yes
 !CONFIG_LIBMODPLUG_DEMUXER=yes
 !CONFIG_LIBNUT_DEMUXER=yes
-!CONFIG_LIBQUVI_DEMUXER=yes
 CONFIG_A64MULTI_ENCODER=yes
 CONFIG_A64MULTI5_ENCODER=yes
 CONFIG_ALIAS_PIX_ENCODER=yes
@@ -1488,6 +1536,8 @@ CONFIG_V210_ENCODER=yes
 CONFIG_V308_ENCODER=yes
 CONFIG_V408_ENCODER=yes
 CONFIG_V410_ENCODER=yes
+CONFIG_VC2_ENCODER=yes
+CONFIG_WRAPPED_AVFRAME_ENCODER=yes
 CONFIG_WMV1_ENCODER=yes
 CONFIG_WMV2_ENCODER=yes
 CONFIG_XBM_ENCODER=yes
@@ -1558,6 +1608,7 @@ CONFIG_DVDSUB_ENCODER=yes
 CONFIG_MOVTEXT_ENCODER=yes
 CONFIG_SRT_ENCODER=yes
 CONFIG_SUBRIP_ENCODER=yes
+CONFIG_TEXT_ENCODER=yes
 CONFIG_WEBVTT_ENCODER=yes
 CONFIG_XSUB_ENCODER=yes
 !CONFIG_LIBFAAC_ENCODER=yes
@@ -1575,7 +1626,6 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_LIBTHEORA_ENCODER=yes
 !CONFIG_LIBTWOLAME_ENCODER=yes
 !CONFIG_LIBUTVIDEO_ENCODER=yes
-!CONFIG_LIBVO_AACENC_ENCODER=yes
 !CONFIG_LIBVO_AMRWBENC_ENCODER=yes
 !CONFIG_LIBVORBIS_ENCODER=yes
 !CONFIG_LIBVPX_VP8_ENCODER=yes
@@ -1589,7 +1639,6 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_LIBX265_ENCODER=yes
 !CONFIG_LIBXAVS_ENCODER=yes
 !CONFIG_LIBXVID_ENCODER=yes
-!CONFIG_LIBAACPLUS_ENCODER=yes
 !CONFIG_LIBOPENH264_ENCODER=yes
 !CONFIG_H264_QSV_ENCODER=yes
 !CONFIG_NVENC_ENCODER=yes
@@ -1598,20 +1647,29 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_HEVC_QSV_ENCODER=yes
 !CONFIG_LIBKVAZAAR_ENCODER=yes
 !CONFIG_MPEG2_QSV_ENCODER=yes
+!CONFIG_ACOMPRESSOR_FILTER=yes
 !CONFIG_ACROSSFADE_FILTER=yes
 !CONFIG_ADELAY_FILTER=yes
 !CONFIG_AECHO_FILTER=yes
+!CONFIG_AEMPHASIS_FILTER=yes
 !CONFIG_AEVAL_FILTER=yes
 !CONFIG_AFADE_FILTER=yes
+!CONFIG_AFFTFILT_FILTER=yes
 !CONFIG_AFORMAT_FILTER=yes
+!CONFIG_AGATE_FILTER=yes
 !CONFIG_AINTERLEAVE_FILTER=yes
+!CONFIG_ALIMITER_FILTER=yes
 !CONFIG_ALLPASS_FILTER=yes
 !CONFIG_AMERGE_FILTER=yes
+!CONFIG_AMETADATA_FILTER=yes
 !CONFIG_AMIX_FILTER=yes
+!CONFIG_ANEQUALIZER_FILTER=yes
 !CONFIG_ANULL_FILTER=yes
 !CONFIG_APAD_FILTER=yes
 !CONFIG_APERMS_FILTER=yes
 !CONFIG_APHASER_FILTER=yes
+!CONFIG_APULSATOR_FILTER=yes
+!CONFIG_AREALTIME_FILTER=yes
 !CONFIG_ARESAMPLE_FILTER=yes
 !CONFIG_AREVERSE_FILTER=yes
 !CONFIG_ASELECT_FILTER=yes
@@ -1623,7 +1681,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_ASHOWINFO_FILTER=yes
 !CONFIG_ASPLIT_FILTER=yes
 !CONFIG_ASTATS_FILTER=yes
-!CONFIG_ASTREAMSYNC_FILTER=yes
+!CONFIG_ASTREAMSELECT_FILTER=yes
 !CONFIG_ASYNCTS_FILTER=yes
 !CONFIG_ATEMPO_FILTER=yes
 !CONFIG_ATRIM_FILTER=yes
@@ -1637,11 +1695,13 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_CHANNELSPLIT_FILTER=yes
 !CONFIG_CHORUS_FILTER=yes
 !CONFIG_COMPAND_FILTER=yes
+!CONFIG_COMPENSATIONDELAY_FILTER=yes
 !CONFIG_DCSHIFT_FILTER=yes
 !CONFIG_DYNAUDNORM_FILTER=yes
 !CONFIG_EARWAX_FILTER=yes
 !CONFIG_EBUR128_FILTER=yes
 !CONFIG_EQUALIZER_FILTER=yes
+!CONFIG_EXTRASTEREO_FILTER=yes
 !CONFIG_FLANGER_FILTER=yes
 !CONFIG_HIGHPASS_FILTER=yes
 !CONFIG_JOIN_FILTER=yes
@@ -1650,13 +1710,21 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_PAN_FILTER=yes
 !CONFIG_REPLAYGAIN_FILTER=yes
 !CONFIG_RESAMPLE_FILTER=yes
+!CONFIG_RUBBERBAND_FILTER=yes
 !CONFIG_SIDECHAINCOMPRESS_FILTER=yes
+!CONFIG_SIDECHAINGATE_FILTER=yes
 !CONFIG_SILENCEDETECT_FILTER=yes
 !CONFIG_SILENCEREMOVE_FILTER=yes
+!CONFIG_SOFALIZER_FILTER=yes
+!CONFIG_STEREOTOOLS_FILTER=yes
+!CONFIG_STEREOWIDEN_FILTER=yes
 !CONFIG_TREBLE_FILTER=yes
+!CONFIG_TREMOLO_FILTER=yes
+!CONFIG_VIBRATO_FILTER=yes
 !CONFIG_VOLUME_FILTER=yes
 !CONFIG_VOLUMEDETECT_FILTER=yes
 !CONFIG_AEVALSRC_FILTER=yes
+!CONFIG_ANOISESRC_FILTER=yes
 !CONFIG_ANULLSRC_FILTER=yes
 !CONFIG_FLITE_FILTER=yes
 !CONFIG_SINE_FILTER=yes
@@ -1670,12 +1738,14 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_BLACKFRAME_FILTER=yes
 !CONFIG_BLEND_FILTER=yes
 !CONFIG_BOXBLUR_FILTER=yes
+!CONFIG_CHROMAKEY_FILTER=yes
 !CONFIG_CODECVIEW_FILTER=yes
 !CONFIG_COLORBALANCE_FILTER=yes
 !CONFIG_COLORCHANNELMIXER_FILTER=yes
 !CONFIG_COLORKEY_FILTER=yes
 !CONFIG_COLORLEVELS_FILTER=yes
 !CONFIG_COLORMATRIX_FILTER=yes
+!CONFIG_CONVOLUTION_FILTER=yes
 !CONFIG_COPY_FILTER=yes
 !CONFIG_COVER_RECT_FILTER=yes
 !CONFIG_CROP_FILTER=yes
@@ -1690,6 +1760,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_DESHAKE_FILTER=yes
 !CONFIG_DETELECINE_FILTER=yes
 !CONFIG_DILATION_FILTER=yes
+!CONFIG_DISPLACE_FILTER=yes
 !CONFIG_DRAWBOX_FILTER=yes
 !CONFIG_DRAWGRAPH_FILTER=yes
 !CONFIG_DRAWGRID_FILTER=yes
@@ -1733,13 +1804,17 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_LUT_FILTER=yes
 !CONFIG_LUTRGB_FILTER=yes
 !CONFIG_LUTYUV_FILTER=yes
+!CONFIG_MASKEDMERGE_FILTER=yes
 !CONFIG_MCDEINT_FILTER=yes
 !CONFIG_MERGEPLANES_FILTER=yes
+!CONFIG_METADATA_FILTER=yes
 !CONFIG_MPDECIMATE_FILTER=yes
 !CONFIG_NEGATE_FILTER=yes
+!CONFIG_NNEDI_FILTER=yes
 !CONFIG_NOFORMAT_FILTER=yes
 !CONFIG_NOISE_FILTER=yes
 !CONFIG_NULL_FILTER=yes
+!CONFIG_OCR_FILTER=yes
 !CONFIG_OCV_FILTER=yes
 !CONFIG_OVERLAY_FILTER=yes
 !CONFIG_OWDENOISE_FILTER=yes
@@ -1756,6 +1831,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_PULLUP_FILTER=yes
 !CONFIG_QP_FILTER=yes
 !CONFIG_RANDOM_FILTER=yes
+!CONFIG_REALTIME_FILTER=yes
 !CONFIG_REMOVEGRAIN_FILTER=yes
 !CONFIG_REMOVELOGO_FILTER=yes
 !CONFIG_REPEATFIELDS_FILTER=yes
@@ -1765,6 +1841,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_SCALE_FILTER=yes
 !CONFIG_SCALE2REF_FILTER=yes
 !CONFIG_SELECT_FILTER=yes
+!CONFIG_SELECTIVECOLOR_FILTER=yes
 !CONFIG_SENDCMD_FILTER=yes
 !CONFIG_SEPARATEFIELDS_FILTER=yes
 !CONFIG_SETDAR_FILTER=yes
@@ -1774,6 +1851,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_SETTB_FILTER=yes
 !CONFIG_SHOWINFO_FILTER=yes
 !CONFIG_SHOWPALETTE_FILTER=yes
+!CONFIG_SHUFFLEFRAMES_FILTER=yes
 !CONFIG_SHUFFLEPLANES_FILTER=yes
 !CONFIG_SIGNALSTATS_FILTER=yes
 !CONFIG_SMARTBLUR_FILTER=yes
@@ -1781,8 +1859,10 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_SPP_FILTER=yes
 !CONFIG_SSIM_FILTER=yes
 !CONFIG_STEREO3D_FILTER=yes
+!CONFIG_STREAMSELECT_FILTER=yes
 !CONFIG_SUBTITLES_FILTER=yes
 !CONFIG_SUPER2XSAI_FILTER=yes
+!CONFIG_SWAPRECT_FILTER=yes
 !CONFIG_SWAPUV_FILTER=yes
 !CONFIG_TBLEND_FILTER=yes
 !CONFIG_TELECINE_FILTER=yes
@@ -1805,6 +1885,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_YADIF_FILTER=yes
 !CONFIG_ZMQ_FILTER=yes
 !CONFIG_ZOOMPAN_FILTER=yes
+!CONFIG_ZSCALE_FILTER=yes
 !CONFIG_ALLRGB_FILTER=yes
 !CONFIG_ALLYUV_FILTER=yes
 !CONFIG_CELLAUTO_FILTER=yes
@@ -1819,21 +1900,24 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_SMPTEBARS_FILTER=yes
 !CONFIG_SMPTEHDBARS_FILTER=yes
 !CONFIG_TESTSRC_FILTER=yes
+!CONFIG_TESTSRC2_FILTER=yes
 !CONFIG_NULLSINK_FILTER=yes
 !CONFIG_ADRAWGRAPH_FILTER=yes
+!CONFIG_AHISTOGRAM_FILTER=yes
 !CONFIG_APHASEMETER_FILTER=yes
 !CONFIG_AVECTORSCOPE_FILTER=yes
 !CONFIG_CONCAT_FILTER=yes
 !CONFIG_SHOWCQT_FILTER=yes
 !CONFIG_SHOWFREQS_FILTER=yes
 !CONFIG_SHOWSPECTRUM_FILTER=yes
+!CONFIG_SHOWSPECTRUMPIC_FILTER=yes
 !CONFIG_SHOWVOLUME_FILTER=yes
 !CONFIG_SHOWWAVES_FILTER=yes
 !CONFIG_SHOWWAVESPIC_FILTER=yes
+!CONFIG_SPECTRUMSYNTH_FILTER=yes
 !CONFIG_AMOVIE_FILTER=yes
 !CONFIG_MOVIE_FILTER=yes
 !CONFIG_H263_VAAPI_HWACCEL=yes
-!CONFIG_H263_VDPAU_HWACCEL=yes
 !CONFIG_H263_VIDEOTOOLBOX_HWACCEL=yes
 !CONFIG_H264_D3D11VA_HWACCEL=yes
 !CONFIG_H264_DXVA2_HWACCEL=yes
@@ -1855,10 +1939,12 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_MPEG2_XVMC_HWACCEL=yes
 !CONFIG_MPEG2_D3D11VA_HWACCEL=yes
 !CONFIG_MPEG2_DXVA2_HWACCEL=yes
+!CONFIG_MPEG2_MMAL_HWACCEL=yes
 !CONFIG_MPEG2_QSV_HWACCEL=yes
 !CONFIG_MPEG2_VAAPI_HWACCEL=yes
 !CONFIG_MPEG2_VDPAU_HWACCEL=yes
 !CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL=yes
+!CONFIG_MPEG4_MMAL_HWACCEL=yes
 !CONFIG_MPEG4_VAAPI_HWACCEL=yes
 !CONFIG_MPEG4_VDPAU_HWACCEL=yes
 !CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL=yes
@@ -1866,7 +1952,11 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_VC1_DXVA2_HWACCEL=yes
 !CONFIG_VC1_VAAPI_HWACCEL=yes
 !CONFIG_VC1_VDPAU_HWACCEL=yes
+!CONFIG_VC1_MMAL_HWACCEL=yes
 !CONFIG_VC1_QSV_HWACCEL=yes
+!CONFIG_VP9_D3D11VA_HWACCEL=yes
+!CONFIG_VP9_DXVA2_HWACCEL=yes
+!CONFIG_VP9_VAAPI_HWACCEL=yes
 !CONFIG_WMV3_D3D11VA_HWACCEL=yes
 !CONFIG_WMV3_DXVA2_HWACCEL=yes
 !CONFIG_WMV3_VAAPI_HWACCEL=yes
@@ -2036,6 +2126,7 @@ CONFIG_WEBVTT_MUXER=yes
 CONFIG_WTV_MUXER=yes
 CONFIG_WV_MUXER=yes
 CONFIG_YUV4MPEGPIPE_MUXER=yes
+!CONFIG_CHROMAPRINT_MUXER=yes
 !CONFIG_LIBNUT_MUXER=yes
 !CONFIG_ALSA_OUTDEV=yes
 !CONFIG_CACA_OUTDEV=yes
@@ -2059,6 +2150,7 @@ CONFIG_DCA_PARSER=yes
 CONFIG_DIRAC_PARSER=yes
 CONFIG_DNXHD_PARSER=yes
 CONFIG_DPX_PARSER=yes
+CONFIG_DVAUDIO_PARSER=yes
 CONFIG_DVBSUB_PARSER=yes
 CONFIG_DVDSUB_PARSER=yes
 CONFIG_DVD_NAV_PARSER=yes
@@ -2116,6 +2208,7 @@ CONFIG_RTP_PROTOCOL=yes
 CONFIG_SRTP_PROTOCOL=yes
 CONFIG_SUBFILE_PROTOCOL=yes
 CONFIG_TCP_PROTOCOL=yes
+!CONFIG_TLS_SCHANNEL_PROTOCOL=yes
 !CONFIG_TLS_SECURETRANSPORT_PROTOCOL=yes
 !CONFIG_TLS_GNUTLS_PROTOCOL=yes
 !CONFIG_TLS_OPENSSL_PROTOCOL=yes
diff --git a/android/config-armv7-a-neon.mak b/android/config-armv7-a-neon.mak
index 74b3953fa8..2e458b3fb7 100644
--- a/android/config-armv7-a-neon.mak
+++ b/android/config-armv7-a-neon.mak
@@ -12,6 +12,7 @@ DOCDIR=$(DESTDIR)${prefix}/share/doc/ffmpeg
 MANDIR=$(DESTDIR)${prefix}/share/man
 PKGCONFIGDIR=$(DESTDIR)${prefix}/lib/pkgconfig
 SRC_PATH=.
+SRC_LINK=.
 ifndef MAIN_MAKEFILE
 SRC_PATH:=$(SRC_PATH:.%=..%)
 endif
@@ -21,6 +22,7 @@ INTRINSICS=none
 CC=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-gcc
 CXX=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-g++
 AS=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-gcc
+OBJCC=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-gcc
 LD=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-gcc
 DEPCC=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-gcc
 DEPCCFLAGS= $(CPPFLAGS)
@@ -38,9 +40,13 @@ LN_S=ln -s -f
 CPPFLAGS= --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-arm -isysroot ../../prebuilts/ndk/current/platforms/android-21/arch-arm -D_ISOC99_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Dstrtod=avpriv_strtod -DPIC -DZLIB_CONST
 CFLAGS=   -march=armv7-a -std=c99 -fomit-frame-pointer -fPIC -marm -pthread -Wdeclaration-after-statement -Wall -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wwrite-strings -Wtype-limits -Wundef -Wmissing-prototypes -Wno-pointer-to-int-cast -Wstrict-prototypes -Wempty-body -Wno-parentheses -Wno-switch -Wno-format-zero-length -Wno-pointer-sign -O3 -fno-math-errno -fno-signed-zeros -fno-tree-vectorize -Werror=format-security -Werror=implicit-function-declaration -Werror=missing-prototypes -Werror=return-type -Werror=vla -Wformat -fdiagnostics-color=auto -Wno-maybe-uninitialized
 CXXFLAGS=  -D__STDC_CONSTANT_MACROS
+OBJCFLAGS=
 ASFLAGS=   -march=armv7-a -fPIC
 AS_C=-c
 AS_O=-o $@
+OBJCC_C=-c
+OBJCC_E=-E -o $@
+OBJCC_O=-o $@
 CC_C=-c
 CC_E=-E -o $@
 CC_O=-o $@
@@ -53,7 +59,7 @@ DLLTOOL=
 WINDRES=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-windres
 DEPWINDRES=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-gcc
 DOXYGEN=doxygen
-LDFLAGS=  --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-arm -isysroot ../../prebuilts/ndk/current/platforms/android-21/arch-arm -Wl,--as-needed -Wl,-z,noexecstack -Wl,--warn-common -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample
+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
 LDEXEFLAGS=
 LDLIBFLAGS=
 SHFLAGS=-shared -Wl,-soname,$$(@F) -Wl,-Bsymbolic -Wl,--version-script,$(SUBDIR)lib$(NAME).ver
@@ -69,13 +75,13 @@ SLIBPREF=lib
 SLIBSUF=.so
 EXESUF=
 EXTRA_VERSION=
-CCDEP=$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< | sed -e "/^\#.*/d" -e "s,^[[:space:]]*$(*F)\\.o,$(@D)/$(*F).o," > $(@:.o=.d)
+CCDEP=
 CXXDEP=
-CCDEP_FLAGS=-MM
-ASDEP=$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< | sed -e "/^\#.*/d" -e "s,^[[:space:]]*$(*F)\\.o,$(@D)/$(*F).o," > $(@:.o=.d)
-ASDEP_FLAGS=-MM
-CC_DEPFLAGS=
-AS_DEPFLAGS=
+CCDEP_FLAGS=
+ASDEP=
+ASDEP_FLAGS=
+CC_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@
+AS_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@
 HOSTCC=gcc
 HOSTLD=gcc
 HOSTCFLAGS=  -std=c99 -Wall -O3
@@ -85,13 +91,13 @@ HOSTLDFLAGS=
 HOSTLIBS=-lm
 DEPHOSTCC=gcc
 DEPHOSTCCFLAGS= $(HOSTCCFLAGS)
-HOSTCCDEP=$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< | sed -e "/^\#.*/d" -e "s,^[[:space:]]*$(*F)\\.o,$(@D)/$(*F).o," > $(@:.o=.d)
-HOSTCCDEP_FLAGS=-MM
-HOSTCC_DEPFLAGS=
+HOSTCCDEP=
+HOSTCCDEP_FLAGS=
+HOSTCC_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@
 HOSTCC_C=-c
 HOSTCC_O=-o $@
 HOSTLD_O=-o $@
-TARGET_EXEC= 
+TARGET_EXEC=
 TARGET_PATH=$(CURDIR)
 TARGET_SAMPLES=$(SAMPLES)
 CFLAGS-ffplay=
@@ -113,33 +119,33 @@ SLIB_INSTALL_EXTRA_LIB=
 SLIB_INSTALL_EXTRA_SHLIB=
 SAMPLES:=$(FATE_SAMPLES)
 NOREDZONE_FLAGS=
-libavcodec_VERSION=56.60.100
-libavcodec_VERSION_MAJOR=56
-libavcodec_VERSION_MINOR=60
-libavdevice_VERSION=56.4.100
-libavdevice_VERSION_MAJOR=56
-libavdevice_VERSION_MINOR=4
-libavfilter_VERSION=5.40.101
-libavfilter_VERSION_MAJOR=5
-libavfilter_VERSION_MINOR=40
-libavformat_VERSION=56.40.101
-libavformat_VERSION_MAJOR=56
-libavformat_VERSION_MINOR=40
-libavresample_VERSION=2.1.0
-libavresample_VERSION_MAJOR=2
-libavresample_VERSION_MINOR=1
-libavutil_VERSION=54.31.100
-libavutil_VERSION_MAJOR=54
-libavutil_VERSION_MINOR=31
-libpostproc_VERSION=53.3.100
-libpostproc_VERSION_MAJOR=53
-libpostproc_VERSION_MINOR=3
-libswresample_VERSION=1.2.101
-libswresample_VERSION_MAJOR=1
-libswresample_VERSION_MINOR=2
-libswscale_VERSION=3.1.101
-libswscale_VERSION_MAJOR=3
-libswscale_VERSION_MINOR=1
+libavcodec_VERSION=57.24.102
+libavcodec_VERSION_MAJOR=57
+libavcodec_VERSION_MINOR=24
+libavdevice_VERSION=57.0.101
+libavdevice_VERSION_MAJOR=57
+libavdevice_VERSION_MINOR=0
+libavfilter_VERSION=6.31.100
+libavfilter_VERSION_MAJOR=6
+libavfilter_VERSION_MINOR=31
+libavformat_VERSION=57.25.100
+libavformat_VERSION_MAJOR=57
+libavformat_VERSION_MINOR=25
+libavresample_VERSION=3.0.0
+libavresample_VERSION_MAJOR=3
+libavresample_VERSION_MINOR=0
+libavutil_VERSION=55.17.103
+libavutil_VERSION_MAJOR=55
+libavutil_VERSION_MINOR=17
+libpostproc_VERSION=54.0.100
+libpostproc_VERSION_MAJOR=54
+libpostproc_VERSION_MINOR=0
+libswresample_VERSION=2.0.101
+libswresample_VERSION_MAJOR=2
+libswresample_VERSION_MINOR=0
+libswscale_VERSION=4.0.100
+libswscale_VERSION_MAJOR=4
+libswscale_VERSION_MINOR=0
 avcodec_FFLIBS=swresample avutil
 avdevice_FFLIBS=avformat avcodec swresample avutil
 avfilter_FFLIBS= avutil
@@ -191,6 +197,7 @@ HAVE_SETEND=yes
 !HAVE_POWER8=yes
 !HAVE_PPC4XX=yes
 !HAVE_VSX=yes
+!HAVE_AESNI=yes
 !HAVE_AMD3DNOW=yes
 !HAVE_AMD3DNOWEXT=yes
 !HAVE_AVX=yes
@@ -210,9 +217,10 @@ HAVE_SETEND=yes
 !HAVE_I686=yes
 !HAVE_MIPSFPU=yes
 !HAVE_MIPS32R2=yes
-!HAVE_MIPS32R5=yes
+!HAVE_MIPS64R2=yes
+!HAVE_MIPS32R6=yes
 !HAVE_MIPS64R6=yes
-!HAVE_MIPSDSPR1=yes
+!HAVE_MIPSDSP=yes
 !HAVE_MIPSDSPR2=yes
 !HAVE_MSA=yes
 HAVE_LOONGSON2=yes
@@ -232,6 +240,7 @@ HAVE_SETEND_EXTERNAL=yes
 !HAVE_POWER8_EXTERNAL=yes
 !HAVE_PPC4XX_EXTERNAL=yes
 !HAVE_VSX_EXTERNAL=yes
+!HAVE_AESNI_EXTERNAL=yes
 !HAVE_AMD3DNOW_EXTERNAL=yes
 !HAVE_AMD3DNOWEXT_EXTERNAL=yes
 !HAVE_AVX_EXTERNAL=yes
@@ -251,9 +260,10 @@ HAVE_SETEND_EXTERNAL=yes
 !HAVE_I686_EXTERNAL=yes
 !HAVE_MIPSFPU_EXTERNAL=yes
 !HAVE_MIPS32R2_EXTERNAL=yes
-!HAVE_MIPS32R5_EXTERNAL=yes
+!HAVE_MIPS64R2_EXTERNAL=yes
+!HAVE_MIPS32R6_EXTERNAL=yes
 !HAVE_MIPS64R6_EXTERNAL=yes
-!HAVE_MIPSDSPR1_EXTERNAL=yes
+!HAVE_MIPSDSP_EXTERNAL=yes
 !HAVE_MIPSDSPR2_EXTERNAL=yes
 !HAVE_MSA_EXTERNAL=yes
 !HAVE_LOONGSON2_EXTERNAL=yes
@@ -273,6 +283,7 @@ HAVE_SETEND_INLINE=yes
 !HAVE_POWER8_INLINE=yes
 !HAVE_PPC4XX_INLINE=yes
 !HAVE_VSX_INLINE=yes
+!HAVE_AESNI_INLINE=yes
 !HAVE_AMD3DNOW_INLINE=yes
 !HAVE_AMD3DNOWEXT_INLINE=yes
 !HAVE_AVX_INLINE=yes
@@ -292,9 +303,10 @@ HAVE_SETEND_INLINE=yes
 !HAVE_I686_INLINE=yes
 !HAVE_MIPSFPU_INLINE=yes
 !HAVE_MIPS32R2_INLINE=yes
-!HAVE_MIPS32R5_INLINE=yes
+!HAVE_MIPS64R2_INLINE=yes
+!HAVE_MIPS32R6_INLINE=yes
 !HAVE_MIPS64R6_INLINE=yes
-!HAVE_MIPSDSPR1_INLINE=yes
+!HAVE_MIPSDSP_INLINE=yes
 !HAVE_MIPSDSPR2_INLINE=yes
 !HAVE_MSA_INLINE=yes
 !HAVE_LOONGSON2_INLINE=yes
@@ -319,6 +331,8 @@ HAVE_ATOMIC_COMPARE_EXCHANGE=yes
 !HAVE_RDTSC=yes
 HAVE_SARESTART=yes
 HAVE_SYNC_VAL_COMPARE_AND_SWAP=yes
+!HAVE_CABS=yes
+!HAVE_CEXP=yes
 HAVE_INLINE_ASM=yes
 !HAVE_SYMVER=yes
 !HAVE_YASM=yes
@@ -348,6 +362,9 @@ HAVE_DLFCN_H=yes
 !HAVE_MACHINE_IOCTL_BT848_H=yes
 !HAVE_MACHINE_IOCTL_METEOR_H=yes
 HAVE_MALLOC_H=yes
+!HAVE_OPENCV2_CORE_CORE_C_H=yes
+!HAVE_OPENJPEG_2_1_OPENJPEG_H=yes
+!HAVE_OPENJPEG_2_0_OPENJPEG_H=yes
 !HAVE_OPENJPEG_1_5_OPENJPEG_H=yes
 !HAVE_OPENGL_GL3_H=yes
 HAVE_POLL_H=yes
@@ -378,6 +395,8 @@ HAVE_ERF=yes
 HAVE_EXP2=yes
 HAVE_EXP2F=yes
 HAVE_EXPF=yes
+HAVE_HYPOT=yes
+HAVE_ISFINITE=yes
 HAVE_ISINF=yes
 HAVE_ISNAN=yes
 HAVE_LDEXPF=yes
@@ -397,6 +416,7 @@ HAVE_TRUNC=yes
 HAVE_TRUNCF=yes
 HAVE_ACCESS=yes
 !HAVE_ALIGNED_MALLOC=yes
+HAVE_ARC4RANDOM=yes
 HAVE_CLOCK_GETTIME=yes
 !HAVE_CLOSESOCKET=yes
 !HAVE_COMMANDLINETOARGVW=yes
@@ -413,7 +433,6 @@ HAVE_GETOPT=yes
 !HAVE_GETPROCESSMEMORYINFO=yes
 !HAVE_GETPROCESSTIMES=yes
 HAVE_GETRUSAGE=yes
-HAVE_GETSERVBYPORT=yes
 !HAVE_GETSYSTEMTIMEASFILETIME=yes
 HAVE_GETTIMEOFDAY=yes
 !HAVE_GLOB=yes
@@ -446,6 +465,7 @@ HAVE_STRERROR_R=yes
 HAVE_SYSCONF=yes
 !HAVE_SYSCTL=yes
 HAVE_USLEEP=yes
+!HAVE_UTGETOSTYPEFROMSTRING=yes
 !HAVE_VIRTUALALLOC=yes
 !HAVE_WGLGETPROCADDRESS=yes
 HAVE_PTHREADS=yes
@@ -462,9 +482,9 @@ HAVE_ATTRIBUTE_PACKED=yes
 HAVE_GNU_AS=yes
 !HAVE_GNU_WINDRES=yes
 !HAVE_IBM_ASM=yes
+!HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS=yes
 HAVE_INLINE_ASM_LABELS=yes
 HAVE_INLINE_ASM_NONLOCAL_LABELS=yes
-!HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS=yes
 HAVE_PRAGMA_DEPRECATED=yes
 HAVE_RSYNC_CONTIMEOUT=yes
 !HAVE_SYMVER_ASM_LABEL=yes
@@ -475,7 +495,6 @@ HAVE_SYMVER_GNU_ASM=yes
 !HAVE_CONDITION_VARIABLE_PTR=yes
 HAVE_SOCKLEN_T=yes
 HAVE_STRUCT_ADDRINFO=yes
-!HAVE_STRUCT_DCADEC_EXSS_INFO_MATRIX_ENCODING=yes
 HAVE_STRUCT_GROUP_SOURCE_REQ=yes
 HAVE_STRUCT_IP_MREQ_SOURCE=yes
 HAVE_STRUCT_IPV6_MREQ=yes
@@ -489,8 +508,8 @@ HAVE_STRUCT_SOCKADDR_STORAGE=yes
 HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE=yes
 HAVE_ATOMICS_NATIVE=yes
 !HAVE_DOS_PATHS=yes
-!HAVE_DXVA2API_COBJ=yes
 !HAVE_DXVA2_LIB=yes
+!HAVE_DXVA2API_COBJ=yes
 !HAVE_LIBC_MSVCRT=yes
 !HAVE_LIBDC1394_1=yes
 !HAVE_LIBDC1394_2=yes
@@ -504,17 +523,18 @@ HAVE_SECTION_DATA_REL_RO=yes
 HAVE_THREADS=yes
 !HAVE_VAAPI_X11=yes
 !HAVE_VDPAU_X11=yes
+!HAVE_WINRT=yes
 !HAVE_XLIB=yes
 CONFIG_BSFS=yes
 CONFIG_DECODERS=yes
-CONFIG_DEMUXERS=yes
 CONFIG_ENCODERS=yes
-!CONFIG_FILTERS=yes
 !CONFIG_HWACCELS=yes
+CONFIG_PARSERS=yes
 !CONFIG_INDEVS=yes
-CONFIG_MUXERS=yes
 !CONFIG_OUTDEVS=yes
-CONFIG_PARSERS=yes
+!CONFIG_FILTERS=yes
+CONFIG_DEMUXERS=yes
+CONFIG_MUXERS=yes
 CONFIG_PROTOCOLS=yes
 !CONFIG_DOC=yes
 !CONFIG_HTMLPAGES=yes
@@ -539,13 +559,15 @@ CONFIG_TRANSCODE_AAC_EXAMPLE=yes
 CONFIG_TRANSCODING_EXAMPLE=yes
 !CONFIG_AVISYNTH=yes
 !CONFIG_BZLIB=yes
+!CONFIG_CHROMAPRINT=yes
 !CONFIG_CRYSTALHD=yes
 !CONFIG_DECKLINK=yes
 !CONFIG_FREI0R=yes
+!CONFIG_GCRYPT=yes
+!CONFIG_GMP=yes
 !CONFIG_GNUTLS=yes
 !CONFIG_ICONV=yes
 !CONFIG_LADSPA=yes
-!CONFIG_LIBAACPLUS=yes
 !CONFIG_LIBASS=yes
 !CONFIG_LIBBLURAY=yes
 !CONFIG_LIBBS2B=yes
@@ -576,8 +598,8 @@ CONFIG_TRANSCODING_EXAMPLE=yes
 !CONFIG_LIBOPENJPEG=yes
 !CONFIG_LIBOPUS=yes
 !CONFIG_LIBPULSE=yes
-!CONFIG_LIBQUVI=yes
 !CONFIG_LIBRTMP=yes
+!CONFIG_LIBRUBBERBAND=yes
 !CONFIG_LIBSCHROEDINGER=yes
 !CONFIG_LIBSHINE=yes
 !CONFIG_LIBSMBCLIENT=yes
@@ -585,13 +607,12 @@ CONFIG_TRANSCODING_EXAMPLE=yes
 !CONFIG_LIBSOXR=yes
 !CONFIG_LIBSPEEX=yes
 !CONFIG_LIBSSH=yes
-!CONFIG_LIBSTAGEFRIGHT_H264=yes
+!CONFIG_LIBTESSERACT=yes
 !CONFIG_LIBTHEORA=yes
 !CONFIG_LIBTWOLAME=yes
 !CONFIG_LIBUTVIDEO=yes
 !CONFIG_LIBV4L2=yes
 !CONFIG_LIBVIDSTAB=yes
-!CONFIG_LIBVO_AACENC=yes
 !CONFIG_LIBVO_AMRWBENC=yes
 !CONFIG_LIBVORBIS=yes
 !CONFIG_LIBVPX=yes
@@ -605,15 +626,18 @@ CONFIG_TRANSCODING_EXAMPLE=yes
 !CONFIG_LIBXCB_SHAPE=yes
 !CONFIG_LIBXCB_XFIXES=yes
 !CONFIG_LIBXVID=yes
+!CONFIG_LIBZIMG=yes
 !CONFIG_LIBZMQ=yes
 !CONFIG_LIBZVBI=yes
 !CONFIG_LZMA=yes
 !CONFIG_MMAL=yes
+!CONFIG_NETCDF=yes
 !CONFIG_NVENC=yes
 !CONFIG_OPENAL=yes
 !CONFIG_OPENCL=yes
 !CONFIG_OPENGL=yes
 !CONFIG_OPENSSL=yes
+!CONFIG_SCHANNEL=yes
 !CONFIG_SDL=yes
 !CONFIG_SECURETRANSPORT=yes
 !CONFIG_X11GRAB=yes
@@ -681,6 +705,7 @@ CONFIG_AUDIODSP=yes
 CONFIG_BLOCKDSP=yes
 CONFIG_BSWAPDSP=yes
 CONFIG_CABAC=yes
+CONFIG_DIRAC_PARSE=yes
 CONFIG_DVPROFILE=yes
 CONFIG_EXIF=yes
 CONFIG_FAANDCT=yes
@@ -690,8 +715,6 @@ CONFIG_FLACDSP=yes
 CONFIG_FMTCONVERT=yes
 CONFIG_FRAME_THREAD_ENCODER=yes
 CONFIG_G722DSP=yes
-!CONFIG_GCRYPT=yes
-!CONFIG_GMP=yes
 CONFIG_GOLOMB=yes
 !CONFIG_GPLV3=yes
 CONFIG_H263DSP=yes
@@ -709,11 +732,12 @@ CONFIG_IMDCT15=yes
 CONFIG_INTRAX8=yes
 CONFIG_IVIDSP=yes
 CONFIG_JPEGTABLES=yes
-!CONFIG_LIBX262=yes
 !CONFIG_LGPLV3=yes
+!CONFIG_LIBX262=yes
 CONFIG_LLAUDDSP=yes
 CONFIG_LLVIDDSP=yes
 CONFIG_LPC=yes
+CONFIG_LZF=yes
 CONFIG_ME_CMP=yes
 CONFIG_MPEG_ER=yes
 CONFIG_MPEGAUDIO=yes
@@ -784,6 +808,7 @@ CONFIG_C93_DECODER=yes
 CONFIG_CAVS_DECODER=yes
 CONFIG_CDGRAPHICS_DECODER=yes
 CONFIG_CDXL_DECODER=yes
+CONFIG_CFHD_DECODER=yes
 CONFIG_CINEPAK_DECODER=yes
 CONFIG_CLJR_DECODER=yes
 CONFIG_CLLC_DECODER=yes
@@ -797,9 +822,11 @@ CONFIG_DIRAC_DECODER=yes
 CONFIG_DNXHD_DECODER=yes
 CONFIG_DPX_DECODER=yes
 CONFIG_DSICINVIDEO_DECODER=yes
+CONFIG_DVAUDIO_DECODER=yes
 CONFIG_DVVIDEO_DECODER=yes
 CONFIG_DXA_DECODER=yes
 CONFIG_DXTORY_DECODER=yes
+CONFIG_DXV_DECODER=yes
 CONFIG_EACMV_DECODER=yes
 CONFIG_EAMAD_DECODER=yes
 CONFIG_EATGQ_DECODER=yes
@@ -841,7 +868,6 @@ CONFIG_HQ_HQA_DECODER=yes
 CONFIG_HQX_DECODER=yes
 CONFIG_HUFFYUV_DECODER=yes
 CONFIG_IDCIN_DECODER=yes
-CONFIG_IFF_BYTERUN1_DECODER=yes
 CONFIG_IFF_ILBM_DECODER=yes
 CONFIG_INDEO2_DECODER=yes
 CONFIG_INDEO3_DECODER=yes
@@ -866,10 +892,12 @@ CONFIG_MPEG1VIDEO_DECODER=yes
 CONFIG_MPEG2VIDEO_DECODER=yes
 CONFIG_MPEG4_DECODER=yes
 !CONFIG_MPEG4_CRYSTALHD_DECODER=yes
+!CONFIG_MPEG4_MMAL_DECODER=yes
 !CONFIG_MPEG4_VDPAU_DECODER=yes
 CONFIG_MPEGVIDEO_DECODER=yes
 !CONFIG_MPEG_VDPAU_DECODER=yes
 !CONFIG_MPEG1_VDPAU_DECODER=yes
+!CONFIG_MPEG2_MMAL_DECODER=yes
 !CONFIG_MPEG2_CRYSTALHD_DECODER=yes
 !CONFIG_MPEG2_QSV_DECODER=yes
 CONFIG_MSA1_DECODER=yes
@@ -908,12 +936,15 @@ CONFIG_RAWVIDEO_DECODER=yes
 CONFIG_RL2_DECODER=yes
 CONFIG_ROQ_DECODER=yes
 CONFIG_RPZA_DECODER=yes
+CONFIG_RSCC_DECODER=yes
 CONFIG_RV10_DECODER=yes
 CONFIG_RV20_DECODER=yes
 CONFIG_RV30_DECODER=yes
 CONFIG_RV40_DECODER=yes
 CONFIG_S302M_DECODER=yes
 CONFIG_SANM_DECODER=yes
+CONFIG_SCREENPRESSO_DECODER=yes
+CONFIG_SDX2_DPCM_DECODER=yes
 CONFIG_SGI_DECODER=yes
 CONFIG_SGIRLE_DECODER=yes
 CONFIG_SMACKER_DECODER=yes
@@ -950,6 +981,7 @@ CONFIG_VC1_DECODER=yes
 !CONFIG_VC1_CRYSTALHD_DECODER=yes
 !CONFIG_VC1_VDPAU_DECODER=yes
 CONFIG_VC1IMAGE_DECODER=yes
+!CONFIG_VC1_MMAL_DECODER=yes
 !CONFIG_VC1_QSV_DECODER=yes
 CONFIG_VCR1_DECODER=yes
 CONFIG_VMDVIDEO_DECODER=yes
@@ -1018,6 +1050,7 @@ CONFIG_GSM_DECODER=yes
 CONFIG_GSM_MS_DECODER=yes
 CONFIG_IAC_DECODER=yes
 CONFIG_IMC_DECODER=yes
+CONFIG_INTERPLAY_ACM_DECODER=yes
 CONFIG_MACE3_DECODER=yes
 CONFIG_MACE6_DECODER=yes
 CONFIG_METASOUND_DECODER=yes
@@ -1061,6 +1094,8 @@ CONFIG_WMAV1_DECODER=yes
 CONFIG_WMAV2_DECODER=yes
 CONFIG_WMAVOICE_DECODER=yes
 CONFIG_WS_SND1_DECODER=yes
+CONFIG_XMA1_DECODER=yes
+CONFIG_XMA2_DECODER=yes
 CONFIG_PCM_ALAW_DECODER=yes
 CONFIG_PCM_BLURAY_DECODER=yes
 CONFIG_PCM_DVD_DECODER=yes
@@ -1098,6 +1133,7 @@ CONFIG_XAN_DPCM_DECODER=yes
 CONFIG_ADPCM_4XM_DECODER=yes
 CONFIG_ADPCM_ADX_DECODER=yes
 CONFIG_ADPCM_AFC_DECODER=yes
+CONFIG_ADPCM_AICA_DECODER=yes
 CONFIG_ADPCM_CT_DECODER=yes
 CONFIG_ADPCM_DTK_DECODER=yes
 CONFIG_ADPCM_EA_DECODER=yes
@@ -1123,6 +1159,7 @@ CONFIG_ADPCM_IMA_SMJPEG_DECODER=yes
 CONFIG_ADPCM_IMA_WAV_DECODER=yes
 CONFIG_ADPCM_IMA_WS_DECODER=yes
 CONFIG_ADPCM_MS_DECODER=yes
+CONFIG_ADPCM_PSX_DECODER=yes
 CONFIG_ADPCM_SBPRO_2_DECODER=yes
 CONFIG_ADPCM_SBPRO_3_DECODER=yes
 CONFIG_ADPCM_SBPRO_4_DECODER=yes
@@ -1132,7 +1169,6 @@ CONFIG_ADPCM_THP_LE_DECODER=yes
 CONFIG_ADPCM_VIMA_DECODER=yes
 CONFIG_ADPCM_XA_DECODER=yes
 CONFIG_ADPCM_YAMAHA_DECODER=yes
-CONFIG_VIMA_DECODER=yes
 CONFIG_SSA_DECODER=yes
 !CONFIG_ASS_DECODER=yes
 CONFIG_CCAPTION_DECODER=yes
@@ -1167,7 +1203,6 @@ CONFIG_XSUB_DECODER=yes
 !CONFIG_LIBOPUS_DECODER=yes
 !CONFIG_LIBSCHROEDINGER_DECODER=yes
 !CONFIG_LIBSPEEX_DECODER=yes
-!CONFIG_LIBSTAGEFRIGHT_H264_DECODER=yes
 !CONFIG_LIBUTVIDEO_DECODER=yes
 !CONFIG_LIBVORBIS_DECODER=yes
 !CONFIG_LIBVPX_VP8_DECODER=yes
@@ -1179,9 +1214,11 @@ CONFIG_IDF_DECODER=yes
 CONFIG_AA_DEMUXER=yes
 CONFIG_AAC_DEMUXER=yes
 CONFIG_AC3_DEMUXER=yes
+CONFIG_ACM_DEMUXER=yes
 CONFIG_ACT_DEMUXER=yes
 CONFIG_ADF_DEMUXER=yes
 CONFIG_ADP_DEMUXER=yes
+CONFIG_ADS_DEMUXER=yes
 CONFIG_ADX_DEMUXER=yes
 CONFIG_AEA_DEMUXER=yes
 CONFIG_AFC_DEMUXER=yes
@@ -1219,6 +1256,7 @@ CONFIG_CINE_DEMUXER=yes
 CONFIG_CONCAT_DEMUXER=yes
 CONFIG_DATA_DEMUXER=yes
 CONFIG_DAUD_DEMUXER=yes
+CONFIG_DCSTR_DEMUXER=yes
 CONFIG_DFA_DEMUXER=yes
 CONFIG_DIRAC_DEMUXER=yes
 CONFIG_DNXHD_DEMUXER=yes
@@ -1243,9 +1281,11 @@ CONFIG_FLV_DEMUXER=yes
 CONFIG_LIVE_FLV_DEMUXER=yes
 CONFIG_FOURXM_DEMUXER=yes
 CONFIG_FRM_DEMUXER=yes
+CONFIG_FSB_DEMUXER=yes
 CONFIG_G722_DEMUXER=yes
 CONFIG_G723_1_DEMUXER=yes
 CONFIG_G729_DEMUXER=yes
+CONFIG_GENH_DEMUXER=yes
 CONFIG_GIF_DEMUXER=yes
 CONFIG_GSM_DEMUXER=yes
 CONFIG_GXF_DEMUXER=yes
@@ -1270,9 +1310,9 @@ CONFIG_IRCAM_DEMUXER=yes
 CONFIG_ISS_DEMUXER=yes
 CONFIG_IV8_DEMUXER=yes
 CONFIG_IVF_DEMUXER=yes
+CONFIG_IVR_DEMUXER=yes
 !CONFIG_JACOSUB_DEMUXER=yes
 CONFIG_JV_DEMUXER=yes
-CONFIG_LATM_DEMUXER=yes
 CONFIG_LMLM4_DEMUXER=yes
 CONFIG_LOAS_DEMUXER=yes
 CONFIG_LRC_DEMUXER=yes
@@ -1298,6 +1338,7 @@ CONFIG_MPEGVIDEO_DEMUXER=yes
 CONFIG_MPJPEG_DEMUXER=yes
 !CONFIG_MPL2_DEMUXER=yes
 CONFIG_MPSUB_DEMUXER=yes
+CONFIG_MSF_DEMUXER=yes
 CONFIG_MSNWC_TCP_DEMUXER=yes
 CONFIG_MTV_DEMUXER=yes
 CONFIG_MV_DEMUXER=yes
@@ -1370,22 +1411,28 @@ CONFIG_STL_DEMUXER=yes
 !CONFIG_SUBVIEWER1_DEMUXER=yes
 !CONFIG_SUBVIEWER_DEMUXER=yes
 CONFIG_SUP_DEMUXER=yes
+CONFIG_SVAG_DEMUXER=yes
 CONFIG_SWF_DEMUXER=yes
 CONFIG_TAK_DEMUXER=yes
 CONFIG_TEDCAPTIONS_DEMUXER=yes
 CONFIG_THP_DEMUXER=yes
+CONFIG_THREEDOSTR_DEMUXER=yes
 CONFIG_TIERTEXSEQ_DEMUXER=yes
 CONFIG_TMV_DEMUXER=yes
 CONFIG_TRUEHD_DEMUXER=yes
 CONFIG_TTA_DEMUXER=yes
 CONFIG_TXD_DEMUXER=yes
 CONFIG_TTY_DEMUXER=yes
+CONFIG_V210_DEMUXER=yes
+CONFIG_V210X_DEMUXER=yes
+CONFIG_VAG_DEMUXER=yes
 CONFIG_VC1_DEMUXER=yes
 CONFIG_VC1T_DEMUXER=yes
 CONFIG_VIVO_DEMUXER=yes
 CONFIG_VMD_DEMUXER=yes
 CONFIG_VOBSUB_DEMUXER=yes
 CONFIG_VOC_DEMUXER=yes
+CONFIG_VPK_DEMUXER=yes
 !CONFIG_VPLAYER_DEMUXER=yes
 CONFIG_VQF_DEMUXER=yes
 CONFIG_W64_DEMUXER=yes
@@ -1396,10 +1443,12 @@ CONFIG_WEBVTT_DEMUXER=yes
 CONFIG_WSAUD_DEMUXER=yes
 CONFIG_WSVQA_DEMUXER=yes
 CONFIG_WTV_DEMUXER=yes
+CONFIG_WVE_DEMUXER=yes
 CONFIG_WV_DEMUXER=yes
 CONFIG_XA_DEMUXER=yes
 CONFIG_XBIN_DEMUXER=yes
 CONFIG_XMV_DEMUXER=yes
+CONFIG_XVAG_DEMUXER=yes
 CONFIG_XWMA_DEMUXER=yes
 CONFIG_YOP_DEMUXER=yes
 CONFIG_YUV4MPEGPIPE_DEMUXER=yes
@@ -1420,7 +1469,6 @@ CONFIG_IMAGE_WEBP_PIPE_DEMUXER=yes
 !CONFIG_LIBGME_DEMUXER=yes
 !CONFIG_LIBMODPLUG_DEMUXER=yes
 !CONFIG_LIBNUT_DEMUXER=yes
-!CONFIG_LIBQUVI_DEMUXER=yes
 CONFIG_A64MULTI_ENCODER=yes
 CONFIG_A64MULTI5_ENCODER=yes
 CONFIG_ALIAS_PIX_ENCODER=yes
@@ -1488,6 +1536,8 @@ CONFIG_V210_ENCODER=yes
 CONFIG_V308_ENCODER=yes
 CONFIG_V408_ENCODER=yes
 CONFIG_V410_ENCODER=yes
+CONFIG_VC2_ENCODER=yes
+CONFIG_WRAPPED_AVFRAME_ENCODER=yes
 CONFIG_WMV1_ENCODER=yes
 CONFIG_WMV2_ENCODER=yes
 CONFIG_XBM_ENCODER=yes
@@ -1558,6 +1608,7 @@ CONFIG_DVDSUB_ENCODER=yes
 CONFIG_MOVTEXT_ENCODER=yes
 CONFIG_SRT_ENCODER=yes
 CONFIG_SUBRIP_ENCODER=yes
+CONFIG_TEXT_ENCODER=yes
 CONFIG_WEBVTT_ENCODER=yes
 CONFIG_XSUB_ENCODER=yes
 !CONFIG_LIBFAAC_ENCODER=yes
@@ -1575,7 +1626,6 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_LIBTHEORA_ENCODER=yes
 !CONFIG_LIBTWOLAME_ENCODER=yes
 !CONFIG_LIBUTVIDEO_ENCODER=yes
-!CONFIG_LIBVO_AACENC_ENCODER=yes
 !CONFIG_LIBVO_AMRWBENC_ENCODER=yes
 !CONFIG_LIBVORBIS_ENCODER=yes
 !CONFIG_LIBVPX_VP8_ENCODER=yes
@@ -1589,7 +1639,6 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_LIBX265_ENCODER=yes
 !CONFIG_LIBXAVS_ENCODER=yes
 !CONFIG_LIBXVID_ENCODER=yes
-!CONFIG_LIBAACPLUS_ENCODER=yes
 !CONFIG_LIBOPENH264_ENCODER=yes
 !CONFIG_H264_QSV_ENCODER=yes
 !CONFIG_NVENC_ENCODER=yes
@@ -1598,20 +1647,29 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_HEVC_QSV_ENCODER=yes
 !CONFIG_LIBKVAZAAR_ENCODER=yes
 !CONFIG_MPEG2_QSV_ENCODER=yes
+!CONFIG_ACOMPRESSOR_FILTER=yes
 !CONFIG_ACROSSFADE_FILTER=yes
 !CONFIG_ADELAY_FILTER=yes
 !CONFIG_AECHO_FILTER=yes
+!CONFIG_AEMPHASIS_FILTER=yes
 !CONFIG_AEVAL_FILTER=yes
 !CONFIG_AFADE_FILTER=yes
+!CONFIG_AFFTFILT_FILTER=yes
 !CONFIG_AFORMAT_FILTER=yes
+!CONFIG_AGATE_FILTER=yes
 !CONFIG_AINTERLEAVE_FILTER=yes
+!CONFIG_ALIMITER_FILTER=yes
 !CONFIG_ALLPASS_FILTER=yes
 !CONFIG_AMERGE_FILTER=yes
+!CONFIG_AMETADATA_FILTER=yes
 !CONFIG_AMIX_FILTER=yes
+!CONFIG_ANEQUALIZER_FILTER=yes
 !CONFIG_ANULL_FILTER=yes
 !CONFIG_APAD_FILTER=yes
 !CONFIG_APERMS_FILTER=yes
 !CONFIG_APHASER_FILTER=yes
+!CONFIG_APULSATOR_FILTER=yes
+!CONFIG_AREALTIME_FILTER=yes
 !CONFIG_ARESAMPLE_FILTER=yes
 !CONFIG_AREVERSE_FILTER=yes
 !CONFIG_ASELECT_FILTER=yes
@@ -1623,7 +1681,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_ASHOWINFO_FILTER=yes
 !CONFIG_ASPLIT_FILTER=yes
 !CONFIG_ASTATS_FILTER=yes
-!CONFIG_ASTREAMSYNC_FILTER=yes
+!CONFIG_ASTREAMSELECT_FILTER=yes
 !CONFIG_ASYNCTS_FILTER=yes
 !CONFIG_ATEMPO_FILTER=yes
 !CONFIG_ATRIM_FILTER=yes
@@ -1637,11 +1695,13 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_CHANNELSPLIT_FILTER=yes
 !CONFIG_CHORUS_FILTER=yes
 !CONFIG_COMPAND_FILTER=yes
+!CONFIG_COMPENSATIONDELAY_FILTER=yes
 !CONFIG_DCSHIFT_FILTER=yes
 !CONFIG_DYNAUDNORM_FILTER=yes
 !CONFIG_EARWAX_FILTER=yes
 !CONFIG_EBUR128_FILTER=yes
 !CONFIG_EQUALIZER_FILTER=yes
+!CONFIG_EXTRASTEREO_FILTER=yes
 !CONFIG_FLANGER_FILTER=yes
 !CONFIG_HIGHPASS_FILTER=yes
 !CONFIG_JOIN_FILTER=yes
@@ -1650,13 +1710,21 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_PAN_FILTER=yes
 !CONFIG_REPLAYGAIN_FILTER=yes
 !CONFIG_RESAMPLE_FILTER=yes
+!CONFIG_RUBBERBAND_FILTER=yes
 !CONFIG_SIDECHAINCOMPRESS_FILTER=yes
+!CONFIG_SIDECHAINGATE_FILTER=yes
 !CONFIG_SILENCEDETECT_FILTER=yes
 !CONFIG_SILENCEREMOVE_FILTER=yes
+!CONFIG_SOFALIZER_FILTER=yes
+!CONFIG_STEREOTOOLS_FILTER=yes
+!CONFIG_STEREOWIDEN_FILTER=yes
 !CONFIG_TREBLE_FILTER=yes
+!CONFIG_TREMOLO_FILTER=yes
+!CONFIG_VIBRATO_FILTER=yes
 !CONFIG_VOLUME_FILTER=yes
 !CONFIG_VOLUMEDETECT_FILTER=yes
 !CONFIG_AEVALSRC_FILTER=yes
+!CONFIG_ANOISESRC_FILTER=yes
 !CONFIG_ANULLSRC_FILTER=yes
 !CONFIG_FLITE_FILTER=yes
 !CONFIG_SINE_FILTER=yes
@@ -1670,12 +1738,14 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_BLACKFRAME_FILTER=yes
 !CONFIG_BLEND_FILTER=yes
 !CONFIG_BOXBLUR_FILTER=yes
+!CONFIG_CHROMAKEY_FILTER=yes
 !CONFIG_CODECVIEW_FILTER=yes
 !CONFIG_COLORBALANCE_FILTER=yes
 !CONFIG_COLORCHANNELMIXER_FILTER=yes
 !CONFIG_COLORKEY_FILTER=yes
 !CONFIG_COLORLEVELS_FILTER=yes
 !CONFIG_COLORMATRIX_FILTER=yes
+!CONFIG_CONVOLUTION_FILTER=yes
 !CONFIG_COPY_FILTER=yes
 !CONFIG_COVER_RECT_FILTER=yes
 !CONFIG_CROP_FILTER=yes
@@ -1690,6 +1760,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_DESHAKE_FILTER=yes
 !CONFIG_DETELECINE_FILTER=yes
 !CONFIG_DILATION_FILTER=yes
+!CONFIG_DISPLACE_FILTER=yes
 !CONFIG_DRAWBOX_FILTER=yes
 !CONFIG_DRAWGRAPH_FILTER=yes
 !CONFIG_DRAWGRID_FILTER=yes
@@ -1733,13 +1804,17 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_LUT_FILTER=yes
 !CONFIG_LUTRGB_FILTER=yes
 !CONFIG_LUTYUV_FILTER=yes
+!CONFIG_MASKEDMERGE_FILTER=yes
 !CONFIG_MCDEINT_FILTER=yes
 !CONFIG_MERGEPLANES_FILTER=yes
+!CONFIG_METADATA_FILTER=yes
 !CONFIG_MPDECIMATE_FILTER=yes
 !CONFIG_NEGATE_FILTER=yes
+!CONFIG_NNEDI_FILTER=yes
 !CONFIG_NOFORMAT_FILTER=yes
 !CONFIG_NOISE_FILTER=yes
 !CONFIG_NULL_FILTER=yes
+!CONFIG_OCR_FILTER=yes
 !CONFIG_OCV_FILTER=yes
 !CONFIG_OVERLAY_FILTER=yes
 !CONFIG_OWDENOISE_FILTER=yes
@@ -1756,6 +1831,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_PULLUP_FILTER=yes
 !CONFIG_QP_FILTER=yes
 !CONFIG_RANDOM_FILTER=yes
+!CONFIG_REALTIME_FILTER=yes
 !CONFIG_REMOVEGRAIN_FILTER=yes
 !CONFIG_REMOVELOGO_FILTER=yes
 !CONFIG_REPEATFIELDS_FILTER=yes
@@ -1765,6 +1841,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_SCALE_FILTER=yes
 !CONFIG_SCALE2REF_FILTER=yes
 !CONFIG_SELECT_FILTER=yes
+!CONFIG_SELECTIVECOLOR_FILTER=yes
 !CONFIG_SENDCMD_FILTER=yes
 !CONFIG_SEPARATEFIELDS_FILTER=yes
 !CONFIG_SETDAR_FILTER=yes
@@ -1774,6 +1851,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_SETTB_FILTER=yes
 !CONFIG_SHOWINFO_FILTER=yes
 !CONFIG_SHOWPALETTE_FILTER=yes
+!CONFIG_SHUFFLEFRAMES_FILTER=yes
 !CONFIG_SHUFFLEPLANES_FILTER=yes
 !CONFIG_SIGNALSTATS_FILTER=yes
 !CONFIG_SMARTBLUR_FILTER=yes
@@ -1781,8 +1859,10 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_SPP_FILTER=yes
 !CONFIG_SSIM_FILTER=yes
 !CONFIG_STEREO3D_FILTER=yes
+!CONFIG_STREAMSELECT_FILTER=yes
 !CONFIG_SUBTITLES_FILTER=yes
 !CONFIG_SUPER2XSAI_FILTER=yes
+!CONFIG_SWAPRECT_FILTER=yes
 !CONFIG_SWAPUV_FILTER=yes
 !CONFIG_TBLEND_FILTER=yes
 !CONFIG_TELECINE_FILTER=yes
@@ -1805,6 +1885,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_YADIF_FILTER=yes
 !CONFIG_ZMQ_FILTER=yes
 !CONFIG_ZOOMPAN_FILTER=yes
+!CONFIG_ZSCALE_FILTER=yes
 !CONFIG_ALLRGB_FILTER=yes
 !CONFIG_ALLYUV_FILTER=yes
 !CONFIG_CELLAUTO_FILTER=yes
@@ -1819,21 +1900,24 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_SMPTEBARS_FILTER=yes
 !CONFIG_SMPTEHDBARS_FILTER=yes
 !CONFIG_TESTSRC_FILTER=yes
+!CONFIG_TESTSRC2_FILTER=yes
 !CONFIG_NULLSINK_FILTER=yes
 !CONFIG_ADRAWGRAPH_FILTER=yes
+!CONFIG_AHISTOGRAM_FILTER=yes
 !CONFIG_APHASEMETER_FILTER=yes
 !CONFIG_AVECTORSCOPE_FILTER=yes
 !CONFIG_CONCAT_FILTER=yes
 !CONFIG_SHOWCQT_FILTER=yes
 !CONFIG_SHOWFREQS_FILTER=yes
 !CONFIG_SHOWSPECTRUM_FILTER=yes
+!CONFIG_SHOWSPECTRUMPIC_FILTER=yes
 !CONFIG_SHOWVOLUME_FILTER=yes
 !CONFIG_SHOWWAVES_FILTER=yes
 !CONFIG_SHOWWAVESPIC_FILTER=yes
+!CONFIG_SPECTRUMSYNTH_FILTER=yes
 !CONFIG_AMOVIE_FILTER=yes
 !CONFIG_MOVIE_FILTER=yes
 !CONFIG_H263_VAAPI_HWACCEL=yes
-!CONFIG_H263_VDPAU_HWACCEL=yes
 !CONFIG_H263_VIDEOTOOLBOX_HWACCEL=yes
 !CONFIG_H264_D3D11VA_HWACCEL=yes
 !CONFIG_H264_DXVA2_HWACCEL=yes
@@ -1855,10 +1939,12 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_MPEG2_XVMC_HWACCEL=yes
 !CONFIG_MPEG2_D3D11VA_HWACCEL=yes
 !CONFIG_MPEG2_DXVA2_HWACCEL=yes
+!CONFIG_MPEG2_MMAL_HWACCEL=yes
 !CONFIG_MPEG2_QSV_HWACCEL=yes
 !CONFIG_MPEG2_VAAPI_HWACCEL=yes
 !CONFIG_MPEG2_VDPAU_HWACCEL=yes
 !CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL=yes
+!CONFIG_MPEG4_MMAL_HWACCEL=yes
 !CONFIG_MPEG4_VAAPI_HWACCEL=yes
 !CONFIG_MPEG4_VDPAU_HWACCEL=yes
 !CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL=yes
@@ -1866,7 +1952,11 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_VC1_DXVA2_HWACCEL=yes
 !CONFIG_VC1_VAAPI_HWACCEL=yes
 !CONFIG_VC1_VDPAU_HWACCEL=yes
+!CONFIG_VC1_MMAL_HWACCEL=yes
 !CONFIG_VC1_QSV_HWACCEL=yes
+!CONFIG_VP9_D3D11VA_HWACCEL=yes
+!CONFIG_VP9_DXVA2_HWACCEL=yes
+!CONFIG_VP9_VAAPI_HWACCEL=yes
 !CONFIG_WMV3_D3D11VA_HWACCEL=yes
 !CONFIG_WMV3_DXVA2_HWACCEL=yes
 !CONFIG_WMV3_VAAPI_HWACCEL=yes
@@ -2036,6 +2126,7 @@ CONFIG_WEBVTT_MUXER=yes
 CONFIG_WTV_MUXER=yes
 CONFIG_WV_MUXER=yes
 CONFIG_YUV4MPEGPIPE_MUXER=yes
+!CONFIG_CHROMAPRINT_MUXER=yes
 !CONFIG_LIBNUT_MUXER=yes
 !CONFIG_ALSA_OUTDEV=yes
 !CONFIG_CACA_OUTDEV=yes
@@ -2059,6 +2150,7 @@ CONFIG_DCA_PARSER=yes
 CONFIG_DIRAC_PARSER=yes
 CONFIG_DNXHD_PARSER=yes
 CONFIG_DPX_PARSER=yes
+CONFIG_DVAUDIO_PARSER=yes
 CONFIG_DVBSUB_PARSER=yes
 CONFIG_DVDSUB_PARSER=yes
 CONFIG_DVD_NAV_PARSER=yes
@@ -2116,6 +2208,7 @@ CONFIG_RTP_PROTOCOL=yes
 CONFIG_SRTP_PROTOCOL=yes
 CONFIG_SUBFILE_PROTOCOL=yes
 CONFIG_TCP_PROTOCOL=yes
+!CONFIG_TLS_SCHANNEL_PROTOCOL=yes
 !CONFIG_TLS_SECURETRANSPORT_PROTOCOL=yes
 !CONFIG_TLS_GNUTLS_PROTOCOL=yes
 !CONFIG_TLS_OPENSSL_PROTOCOL=yes
diff --git a/android/config-armv7-a.mak b/android/config-armv7-a.mak
index 3c4be5be05..9939b7f62b 100644
--- a/android/config-armv7-a.mak
+++ b/android/config-armv7-a.mak
@@ -12,6 +12,7 @@ DOCDIR=$(DESTDIR)${prefix}/share/doc/ffmpeg
 MANDIR=$(DESTDIR)${prefix}/share/man
 PKGCONFIGDIR=$(DESTDIR)${prefix}/lib/pkgconfig
 SRC_PATH=.
+SRC_LINK=.
 ifndef MAIN_MAKEFILE
 SRC_PATH:=$(SRC_PATH:.%=..%)
 endif
@@ -21,6 +22,7 @@ INTRINSICS=none
 CC=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-gcc
 CXX=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-g++
 AS=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-gcc
+OBJCC=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-gcc
 LD=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-gcc
 DEPCC=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-gcc
 DEPCCFLAGS= $(CPPFLAGS)
@@ -38,9 +40,13 @@ LN_S=ln -s -f
 CPPFLAGS= --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-arm -isysroot ../../prebuilts/ndk/current/platforms/android-21/arch-arm -D_ISOC99_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Dstrtod=avpriv_strtod -DPIC -DZLIB_CONST
 CFLAGS=   -march=armv7-a -std=c99 -fomit-frame-pointer -fPIC -marm -pthread -Wdeclaration-after-statement -Wall -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wwrite-strings -Wtype-limits -Wundef -Wmissing-prototypes -Wno-pointer-to-int-cast -Wstrict-prototypes -Wempty-body -Wno-parentheses -Wno-switch -Wno-format-zero-length -Wno-pointer-sign -O3 -fno-math-errno -fno-signed-zeros -fno-tree-vectorize -Werror=format-security -Werror=implicit-function-declaration -Werror=missing-prototypes -Werror=return-type -Werror=vla -Wformat -fdiagnostics-color=auto -Wno-maybe-uninitialized
 CXXFLAGS=  -D__STDC_CONSTANT_MACROS
+OBJCFLAGS=
 ASFLAGS=   -march=armv7-a -fPIC
 AS_C=-c
 AS_O=-o $@
+OBJCC_C=-c
+OBJCC_E=-E -o $@
+OBJCC_O=-o $@
 CC_C=-c
 CC_E=-E -o $@
 CC_O=-o $@
@@ -53,7 +59,7 @@ DLLTOOL=
 WINDRES=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-windres
 DEPWINDRES=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-gcc
 DOXYGEN=doxygen
-LDFLAGS=  --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-arm -isysroot ../../prebuilts/ndk/current/platforms/android-21/arch-arm -Wl,--as-needed -Wl,-z,noexecstack -Wl,--warn-common -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample
+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
 LDEXEFLAGS=
 LDLIBFLAGS=
 SHFLAGS=-shared -Wl,-soname,$$(@F) -Wl,-Bsymbolic -Wl,--version-script,$(SUBDIR)lib$(NAME).ver
@@ -69,13 +75,13 @@ SLIBPREF=lib
 SLIBSUF=.so
 EXESUF=
 EXTRA_VERSION=
-CCDEP=$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< | sed -e "/^\#.*/d" -e "s,^[[:space:]]*$(*F)\\.o,$(@D)/$(*F).o," > $(@:.o=.d)
+CCDEP=
 CXXDEP=
-CCDEP_FLAGS=-MM
-ASDEP=$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< | sed -e "/^\#.*/d" -e "s,^[[:space:]]*$(*F)\\.o,$(@D)/$(*F).o," > $(@:.o=.d)
-ASDEP_FLAGS=-MM
-CC_DEPFLAGS=
-AS_DEPFLAGS=
+CCDEP_FLAGS=
+ASDEP=
+ASDEP_FLAGS=
+CC_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@
+AS_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@
 HOSTCC=gcc
 HOSTLD=gcc
 HOSTCFLAGS=  -std=c99 -Wall -O3
@@ -85,13 +91,13 @@ HOSTLDFLAGS=
 HOSTLIBS=-lm
 DEPHOSTCC=gcc
 DEPHOSTCCFLAGS= $(HOSTCCFLAGS)
-HOSTCCDEP=$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< | sed -e "/^\#.*/d" -e "s,^[[:space:]]*$(*F)\\.o,$(@D)/$(*F).o," > $(@:.o=.d)
-HOSTCCDEP_FLAGS=-MM
-HOSTCC_DEPFLAGS=
+HOSTCCDEP=
+HOSTCCDEP_FLAGS=
+HOSTCC_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@
 HOSTCC_C=-c
 HOSTCC_O=-o $@
 HOSTLD_O=-o $@
-TARGET_EXEC= 
+TARGET_EXEC=
 TARGET_PATH=$(CURDIR)
 TARGET_SAMPLES=$(SAMPLES)
 CFLAGS-ffplay=
@@ -113,33 +119,33 @@ SLIB_INSTALL_EXTRA_LIB=
 SLIB_INSTALL_EXTRA_SHLIB=
 SAMPLES:=$(FATE_SAMPLES)
 NOREDZONE_FLAGS=
-libavcodec_VERSION=56.60.100
-libavcodec_VERSION_MAJOR=56
-libavcodec_VERSION_MINOR=60
-libavdevice_VERSION=56.4.100
-libavdevice_VERSION_MAJOR=56
-libavdevice_VERSION_MINOR=4
-libavfilter_VERSION=5.40.101
-libavfilter_VERSION_MAJOR=5
-libavfilter_VERSION_MINOR=40
-libavformat_VERSION=56.40.101
-libavformat_VERSION_MAJOR=56
-libavformat_VERSION_MINOR=40
-libavresample_VERSION=2.1.0
-libavresample_VERSION_MAJOR=2
-libavresample_VERSION_MINOR=1
-libavutil_VERSION=54.31.100
-libavutil_VERSION_MAJOR=54
-libavutil_VERSION_MINOR=31
-libpostproc_VERSION=53.3.100
-libpostproc_VERSION_MAJOR=53
-libpostproc_VERSION_MINOR=3
-libswresample_VERSION=1.2.101
-libswresample_VERSION_MAJOR=1
-libswresample_VERSION_MINOR=2
-libswscale_VERSION=3.1.101
-libswscale_VERSION_MAJOR=3
-libswscale_VERSION_MINOR=1
+libavcodec_VERSION=57.24.102
+libavcodec_VERSION_MAJOR=57
+libavcodec_VERSION_MINOR=24
+libavdevice_VERSION=57.0.101
+libavdevice_VERSION_MAJOR=57
+libavdevice_VERSION_MINOR=0
+libavfilter_VERSION=6.31.100
+libavfilter_VERSION_MAJOR=6
+libavfilter_VERSION_MINOR=31
+libavformat_VERSION=57.25.100
+libavformat_VERSION_MAJOR=57
+libavformat_VERSION_MINOR=25
+libavresample_VERSION=3.0.0
+libavresample_VERSION_MAJOR=3
+libavresample_VERSION_MINOR=0
+libavutil_VERSION=55.17.103
+libavutil_VERSION_MAJOR=55
+libavutil_VERSION_MINOR=17
+libpostproc_VERSION=54.0.100
+libpostproc_VERSION_MAJOR=54
+libpostproc_VERSION_MINOR=0
+libswresample_VERSION=2.0.101
+libswresample_VERSION_MAJOR=2
+libswresample_VERSION_MINOR=0
+libswscale_VERSION=4.0.100
+libswscale_VERSION_MAJOR=4
+libswscale_VERSION_MINOR=0
 avcodec_FFLIBS=swresample avutil
 avdevice_FFLIBS=avformat avcodec swresample avutil
 avfilter_FFLIBS= avutil
@@ -191,6 +197,7 @@ HAVE_SETEND=yes
 !HAVE_POWER8=yes
 !HAVE_PPC4XX=yes
 !HAVE_VSX=yes
+!HAVE_AESNI=yes
 !HAVE_AMD3DNOW=yes
 !HAVE_AMD3DNOWEXT=yes
 !HAVE_AVX=yes
@@ -210,9 +217,10 @@ HAVE_SETEND=yes
 !HAVE_I686=yes
 !HAVE_MIPSFPU=yes
 !HAVE_MIPS32R2=yes
-!HAVE_MIPS32R5=yes
+!HAVE_MIPS64R2=yes
+!HAVE_MIPS32R6=yes
 !HAVE_MIPS64R6=yes
-!HAVE_MIPSDSPR1=yes
+!HAVE_MIPSDSP=yes
 !HAVE_MIPSDSPR2=yes
 !HAVE_MSA=yes
 HAVE_LOONGSON2=yes
@@ -232,6 +240,7 @@ HAVE_SETEND_EXTERNAL=yes
 !HAVE_POWER8_EXTERNAL=yes
 !HAVE_PPC4XX_EXTERNAL=yes
 !HAVE_VSX_EXTERNAL=yes
+!HAVE_AESNI_EXTERNAL=yes
 !HAVE_AMD3DNOW_EXTERNAL=yes
 !HAVE_AMD3DNOWEXT_EXTERNAL=yes
 !HAVE_AVX_EXTERNAL=yes
@@ -251,9 +260,10 @@ HAVE_SETEND_EXTERNAL=yes
 !HAVE_I686_EXTERNAL=yes
 !HAVE_MIPSFPU_EXTERNAL=yes
 !HAVE_MIPS32R2_EXTERNAL=yes
-!HAVE_MIPS32R5_EXTERNAL=yes
+!HAVE_MIPS64R2_EXTERNAL=yes
+!HAVE_MIPS32R6_EXTERNAL=yes
 !HAVE_MIPS64R6_EXTERNAL=yes
-!HAVE_MIPSDSPR1_EXTERNAL=yes
+!HAVE_MIPSDSP_EXTERNAL=yes
 !HAVE_MIPSDSPR2_EXTERNAL=yes
 !HAVE_MSA_EXTERNAL=yes
 !HAVE_LOONGSON2_EXTERNAL=yes
@@ -273,6 +283,7 @@ HAVE_SETEND_INLINE=yes
 !HAVE_POWER8_INLINE=yes
 !HAVE_PPC4XX_INLINE=yes
 !HAVE_VSX_INLINE=yes
+!HAVE_AESNI_INLINE=yes
 !HAVE_AMD3DNOW_INLINE=yes
 !HAVE_AMD3DNOWEXT_INLINE=yes
 !HAVE_AVX_INLINE=yes
@@ -292,9 +303,10 @@ HAVE_SETEND_INLINE=yes
 !HAVE_I686_INLINE=yes
 !HAVE_MIPSFPU_INLINE=yes
 !HAVE_MIPS32R2_INLINE=yes
-!HAVE_MIPS32R5_INLINE=yes
+!HAVE_MIPS64R2_INLINE=yes
+!HAVE_MIPS32R6_INLINE=yes
 !HAVE_MIPS64R6_INLINE=yes
-!HAVE_MIPSDSPR1_INLINE=yes
+!HAVE_MIPSDSP_INLINE=yes
 !HAVE_MIPSDSPR2_INLINE=yes
 !HAVE_MSA_INLINE=yes
 !HAVE_LOONGSON2_INLINE=yes
@@ -319,6 +331,8 @@ HAVE_ATOMIC_COMPARE_EXCHANGE=yes
 !HAVE_RDTSC=yes
 HAVE_SARESTART=yes
 HAVE_SYNC_VAL_COMPARE_AND_SWAP=yes
+!HAVE_CABS=yes
+!HAVE_CEXP=yes
 HAVE_INLINE_ASM=yes
 !HAVE_SYMVER=yes
 !HAVE_YASM=yes
@@ -348,6 +362,9 @@ HAVE_DLFCN_H=yes
 !HAVE_MACHINE_IOCTL_BT848_H=yes
 !HAVE_MACHINE_IOCTL_METEOR_H=yes
 HAVE_MALLOC_H=yes
+!HAVE_OPENCV2_CORE_CORE_C_H=yes
+!HAVE_OPENJPEG_2_1_OPENJPEG_H=yes
+!HAVE_OPENJPEG_2_0_OPENJPEG_H=yes
 !HAVE_OPENJPEG_1_5_OPENJPEG_H=yes
 !HAVE_OPENGL_GL3_H=yes
 HAVE_POLL_H=yes
@@ -378,6 +395,8 @@ HAVE_ERF=yes
 HAVE_EXP2=yes
 HAVE_EXP2F=yes
 HAVE_EXPF=yes
+HAVE_HYPOT=yes
+HAVE_ISFINITE=yes
 HAVE_ISINF=yes
 HAVE_ISNAN=yes
 HAVE_LDEXPF=yes
@@ -397,6 +416,7 @@ HAVE_TRUNC=yes
 HAVE_TRUNCF=yes
 HAVE_ACCESS=yes
 !HAVE_ALIGNED_MALLOC=yes
+HAVE_ARC4RANDOM=yes
 HAVE_CLOCK_GETTIME=yes
 !HAVE_CLOSESOCKET=yes
 !HAVE_COMMANDLINETOARGVW=yes
@@ -413,7 +433,6 @@ HAVE_GETOPT=yes
 !HAVE_GETPROCESSMEMORYINFO=yes
 !HAVE_GETPROCESSTIMES=yes
 HAVE_GETRUSAGE=yes
-HAVE_GETSERVBYPORT=yes
 !HAVE_GETSYSTEMTIMEASFILETIME=yes
 HAVE_GETTIMEOFDAY=yes
 !HAVE_GLOB=yes
@@ -446,6 +465,7 @@ HAVE_STRERROR_R=yes
 HAVE_SYSCONF=yes
 !HAVE_SYSCTL=yes
 HAVE_USLEEP=yes
+!HAVE_UTGETOSTYPEFROMSTRING=yes
 !HAVE_VIRTUALALLOC=yes
 !HAVE_WGLGETPROCADDRESS=yes
 HAVE_PTHREADS=yes
@@ -462,9 +482,9 @@ HAVE_ATTRIBUTE_PACKED=yes
 HAVE_GNU_AS=yes
 !HAVE_GNU_WINDRES=yes
 !HAVE_IBM_ASM=yes
+!HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS=yes
 HAVE_INLINE_ASM_LABELS=yes
 HAVE_INLINE_ASM_NONLOCAL_LABELS=yes
-!HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS=yes
 HAVE_PRAGMA_DEPRECATED=yes
 HAVE_RSYNC_CONTIMEOUT=yes
 !HAVE_SYMVER_ASM_LABEL=yes
@@ -475,7 +495,6 @@ HAVE_SYMVER_GNU_ASM=yes
 !HAVE_CONDITION_VARIABLE_PTR=yes
 HAVE_SOCKLEN_T=yes
 HAVE_STRUCT_ADDRINFO=yes
-!HAVE_STRUCT_DCADEC_EXSS_INFO_MATRIX_ENCODING=yes
 HAVE_STRUCT_GROUP_SOURCE_REQ=yes
 HAVE_STRUCT_IP_MREQ_SOURCE=yes
 HAVE_STRUCT_IPV6_MREQ=yes
@@ -489,8 +508,8 @@ HAVE_STRUCT_SOCKADDR_STORAGE=yes
 HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE=yes
 HAVE_ATOMICS_NATIVE=yes
 !HAVE_DOS_PATHS=yes
-!HAVE_DXVA2API_COBJ=yes
 !HAVE_DXVA2_LIB=yes
+!HAVE_DXVA2API_COBJ=yes
 !HAVE_LIBC_MSVCRT=yes
 !HAVE_LIBDC1394_1=yes
 !HAVE_LIBDC1394_2=yes
@@ -504,17 +523,18 @@ HAVE_SECTION_DATA_REL_RO=yes
 HAVE_THREADS=yes
 !HAVE_VAAPI_X11=yes
 !HAVE_VDPAU_X11=yes
+!HAVE_WINRT=yes
 !HAVE_XLIB=yes
 CONFIG_BSFS=yes
 CONFIG_DECODERS=yes
-CONFIG_DEMUXERS=yes
 CONFIG_ENCODERS=yes
-!CONFIG_FILTERS=yes
 !CONFIG_HWACCELS=yes
+CONFIG_PARSERS=yes
 !CONFIG_INDEVS=yes
-CONFIG_MUXERS=yes
 !CONFIG_OUTDEVS=yes
-CONFIG_PARSERS=yes
+!CONFIG_FILTERS=yes
+CONFIG_DEMUXERS=yes
+CONFIG_MUXERS=yes
 CONFIG_PROTOCOLS=yes
 !CONFIG_DOC=yes
 !CONFIG_HTMLPAGES=yes
@@ -539,13 +559,15 @@ CONFIG_TRANSCODE_AAC_EXAMPLE=yes
 CONFIG_TRANSCODING_EXAMPLE=yes
 !CONFIG_AVISYNTH=yes
 !CONFIG_BZLIB=yes
+!CONFIG_CHROMAPRINT=yes
 !CONFIG_CRYSTALHD=yes
 !CONFIG_DECKLINK=yes
 !CONFIG_FREI0R=yes
+!CONFIG_GCRYPT=yes
+!CONFIG_GMP=yes
 !CONFIG_GNUTLS=yes
 !CONFIG_ICONV=yes
 !CONFIG_LADSPA=yes
-!CONFIG_LIBAACPLUS=yes
 !CONFIG_LIBASS=yes
 !CONFIG_LIBBLURAY=yes
 !CONFIG_LIBBS2B=yes
@@ -576,8 +598,8 @@ CONFIG_TRANSCODING_EXAMPLE=yes
 !CONFIG_LIBOPENJPEG=yes
 !CONFIG_LIBOPUS=yes
 !CONFIG_LIBPULSE=yes
-!CONFIG_LIBQUVI=yes
 !CONFIG_LIBRTMP=yes
+!CONFIG_LIBRUBBERBAND=yes
 !CONFIG_LIBSCHROEDINGER=yes
 !CONFIG_LIBSHINE=yes
 !CONFIG_LIBSMBCLIENT=yes
@@ -585,13 +607,12 @@ CONFIG_TRANSCODING_EXAMPLE=yes
 !CONFIG_LIBSOXR=yes
 !CONFIG_LIBSPEEX=yes
 !CONFIG_LIBSSH=yes
-!CONFIG_LIBSTAGEFRIGHT_H264=yes
+!CONFIG_LIBTESSERACT=yes
 !CONFIG_LIBTHEORA=yes
 !CONFIG_LIBTWOLAME=yes
 !CONFIG_LIBUTVIDEO=yes
 !CONFIG_LIBV4L2=yes
 !CONFIG_LIBVIDSTAB=yes
-!CONFIG_LIBVO_AACENC=yes
 !CONFIG_LIBVO_AMRWBENC=yes
 !CONFIG_LIBVORBIS=yes
 !CONFIG_LIBVPX=yes
@@ -605,15 +626,18 @@ CONFIG_TRANSCODING_EXAMPLE=yes
 !CONFIG_LIBXCB_SHAPE=yes
 !CONFIG_LIBXCB_XFIXES=yes
 !CONFIG_LIBXVID=yes
+!CONFIG_LIBZIMG=yes
 !CONFIG_LIBZMQ=yes
 !CONFIG_LIBZVBI=yes
 !CONFIG_LZMA=yes
 !CONFIG_MMAL=yes
+!CONFIG_NETCDF=yes
 !CONFIG_NVENC=yes
 !CONFIG_OPENAL=yes
 !CONFIG_OPENCL=yes
 !CONFIG_OPENGL=yes
 !CONFIG_OPENSSL=yes
+!CONFIG_SCHANNEL=yes
 !CONFIG_SDL=yes
 !CONFIG_SECURETRANSPORT=yes
 !CONFIG_X11GRAB=yes
@@ -681,6 +705,7 @@ CONFIG_AUDIODSP=yes
 CONFIG_BLOCKDSP=yes
 CONFIG_BSWAPDSP=yes
 CONFIG_CABAC=yes
+CONFIG_DIRAC_PARSE=yes
 CONFIG_DVPROFILE=yes
 CONFIG_EXIF=yes
 CONFIG_FAANDCT=yes
@@ -690,8 +715,6 @@ CONFIG_FLACDSP=yes
 CONFIG_FMTCONVERT=yes
 CONFIG_FRAME_THREAD_ENCODER=yes
 CONFIG_G722DSP=yes
-!CONFIG_GCRYPT=yes
-!CONFIG_GMP=yes
 CONFIG_GOLOMB=yes
 !CONFIG_GPLV3=yes
 CONFIG_H263DSP=yes
@@ -709,11 +732,12 @@ CONFIG_IMDCT15=yes
 CONFIG_INTRAX8=yes
 CONFIG_IVIDSP=yes
 CONFIG_JPEGTABLES=yes
-!CONFIG_LIBX262=yes
 !CONFIG_LGPLV3=yes
+!CONFIG_LIBX262=yes
 CONFIG_LLAUDDSP=yes
 CONFIG_LLVIDDSP=yes
 CONFIG_LPC=yes
+CONFIG_LZF=yes
 CONFIG_ME_CMP=yes
 CONFIG_MPEG_ER=yes
 CONFIG_MPEGAUDIO=yes
@@ -784,6 +808,7 @@ CONFIG_C93_DECODER=yes
 CONFIG_CAVS_DECODER=yes
 CONFIG_CDGRAPHICS_DECODER=yes
 CONFIG_CDXL_DECODER=yes
+CONFIG_CFHD_DECODER=yes
 CONFIG_CINEPAK_DECODER=yes
 CONFIG_CLJR_DECODER=yes
 CONFIG_CLLC_DECODER=yes
@@ -797,9 +822,11 @@ CONFIG_DIRAC_DECODER=yes
 CONFIG_DNXHD_DECODER=yes
 CONFIG_DPX_DECODER=yes
 CONFIG_DSICINVIDEO_DECODER=yes
+CONFIG_DVAUDIO_DECODER=yes
 CONFIG_DVVIDEO_DECODER=yes
 CONFIG_DXA_DECODER=yes
 CONFIG_DXTORY_DECODER=yes
+CONFIG_DXV_DECODER=yes
 CONFIG_EACMV_DECODER=yes
 CONFIG_EAMAD_DECODER=yes
 CONFIG_EATGQ_DECODER=yes
@@ -841,7 +868,6 @@ CONFIG_HQ_HQA_DECODER=yes
 CONFIG_HQX_DECODER=yes
 CONFIG_HUFFYUV_DECODER=yes
 CONFIG_IDCIN_DECODER=yes
-CONFIG_IFF_BYTERUN1_DECODER=yes
 CONFIG_IFF_ILBM_DECODER=yes
 CONFIG_INDEO2_DECODER=yes
 CONFIG_INDEO3_DECODER=yes
@@ -866,10 +892,12 @@ CONFIG_MPEG1VIDEO_DECODER=yes
 CONFIG_MPEG2VIDEO_DECODER=yes
 CONFIG_MPEG4_DECODER=yes
 !CONFIG_MPEG4_CRYSTALHD_DECODER=yes
+!CONFIG_MPEG4_MMAL_DECODER=yes
 !CONFIG_MPEG4_VDPAU_DECODER=yes
 CONFIG_MPEGVIDEO_DECODER=yes
 !CONFIG_MPEG_VDPAU_DECODER=yes
 !CONFIG_MPEG1_VDPAU_DECODER=yes
+!CONFIG_MPEG2_MMAL_DECODER=yes
 !CONFIG_MPEG2_CRYSTALHD_DECODER=yes
 !CONFIG_MPEG2_QSV_DECODER=yes
 CONFIG_MSA1_DECODER=yes
@@ -908,12 +936,15 @@ CONFIG_RAWVIDEO_DECODER=yes
 CONFIG_RL2_DECODER=yes
 CONFIG_ROQ_DECODER=yes
 CONFIG_RPZA_DECODER=yes
+CONFIG_RSCC_DECODER=yes
 CONFIG_RV10_DECODER=yes
 CONFIG_RV20_DECODER=yes
 CONFIG_RV30_DECODER=yes
 CONFIG_RV40_DECODER=yes
 CONFIG_S302M_DECODER=yes
 CONFIG_SANM_DECODER=yes
+CONFIG_SCREENPRESSO_DECODER=yes
+CONFIG_SDX2_DPCM_DECODER=yes
 CONFIG_SGI_DECODER=yes
 CONFIG_SGIRLE_DECODER=yes
 CONFIG_SMACKER_DECODER=yes
@@ -950,6 +981,7 @@ CONFIG_VC1_DECODER=yes
 !CONFIG_VC1_CRYSTALHD_DECODER=yes
 !CONFIG_VC1_VDPAU_DECODER=yes
 CONFIG_VC1IMAGE_DECODER=yes
+!CONFIG_VC1_MMAL_DECODER=yes
 !CONFIG_VC1_QSV_DECODER=yes
 CONFIG_VCR1_DECODER=yes
 CONFIG_VMDVIDEO_DECODER=yes
@@ -1018,6 +1050,7 @@ CONFIG_GSM_DECODER=yes
 CONFIG_GSM_MS_DECODER=yes
 CONFIG_IAC_DECODER=yes
 CONFIG_IMC_DECODER=yes
+CONFIG_INTERPLAY_ACM_DECODER=yes
 CONFIG_MACE3_DECODER=yes
 CONFIG_MACE6_DECODER=yes
 CONFIG_METASOUND_DECODER=yes
@@ -1061,6 +1094,8 @@ CONFIG_WMAV1_DECODER=yes
 CONFIG_WMAV2_DECODER=yes
 CONFIG_WMAVOICE_DECODER=yes
 CONFIG_WS_SND1_DECODER=yes
+CONFIG_XMA1_DECODER=yes
+CONFIG_XMA2_DECODER=yes
 CONFIG_PCM_ALAW_DECODER=yes
 CONFIG_PCM_BLURAY_DECODER=yes
 CONFIG_PCM_DVD_DECODER=yes
@@ -1098,6 +1133,7 @@ CONFIG_XAN_DPCM_DECODER=yes
 CONFIG_ADPCM_4XM_DECODER=yes
 CONFIG_ADPCM_ADX_DECODER=yes
 CONFIG_ADPCM_AFC_DECODER=yes
+CONFIG_ADPCM_AICA_DECODER=yes
 CONFIG_ADPCM_CT_DECODER=yes
 CONFIG_ADPCM_DTK_DECODER=yes
 CONFIG_ADPCM_EA_DECODER=yes
@@ -1123,6 +1159,7 @@ CONFIG_ADPCM_IMA_SMJPEG_DECODER=yes
 CONFIG_ADPCM_IMA_WAV_DECODER=yes
 CONFIG_ADPCM_IMA_WS_DECODER=yes
 CONFIG_ADPCM_MS_DECODER=yes
+CONFIG_ADPCM_PSX_DECODER=yes
 CONFIG_ADPCM_SBPRO_2_DECODER=yes
 CONFIG_ADPCM_SBPRO_3_DECODER=yes
 CONFIG_ADPCM_SBPRO_4_DECODER=yes
@@ -1132,7 +1169,6 @@ CONFIG_ADPCM_THP_LE_DECODER=yes
 CONFIG_ADPCM_VIMA_DECODER=yes
 CONFIG_ADPCM_XA_DECODER=yes
 CONFIG_ADPCM_YAMAHA_DECODER=yes
-CONFIG_VIMA_DECODER=yes
 CONFIG_SSA_DECODER=yes
 !CONFIG_ASS_DECODER=yes
 CONFIG_CCAPTION_DECODER=yes
@@ -1167,7 +1203,6 @@ CONFIG_XSUB_DECODER=yes
 !CONFIG_LIBOPUS_DECODER=yes
 !CONFIG_LIBSCHROEDINGER_DECODER=yes
 !CONFIG_LIBSPEEX_DECODER=yes
-!CONFIG_LIBSTAGEFRIGHT_H264_DECODER=yes
 !CONFIG_LIBUTVIDEO_DECODER=yes
 !CONFIG_LIBVORBIS_DECODER=yes
 !CONFIG_LIBVPX_VP8_DECODER=yes
@@ -1179,9 +1214,11 @@ CONFIG_IDF_DECODER=yes
 CONFIG_AA_DEMUXER=yes
 CONFIG_AAC_DEMUXER=yes
 CONFIG_AC3_DEMUXER=yes
+CONFIG_ACM_DEMUXER=yes
 CONFIG_ACT_DEMUXER=yes
 CONFIG_ADF_DEMUXER=yes
 CONFIG_ADP_DEMUXER=yes
+CONFIG_ADS_DEMUXER=yes
 CONFIG_ADX_DEMUXER=yes
 CONFIG_AEA_DEMUXER=yes
 CONFIG_AFC_DEMUXER=yes
@@ -1219,6 +1256,7 @@ CONFIG_CINE_DEMUXER=yes
 CONFIG_CONCAT_DEMUXER=yes
 CONFIG_DATA_DEMUXER=yes
 CONFIG_DAUD_DEMUXER=yes
+CONFIG_DCSTR_DEMUXER=yes
 CONFIG_DFA_DEMUXER=yes
 CONFIG_DIRAC_DEMUXER=yes
 CONFIG_DNXHD_DEMUXER=yes
@@ -1243,9 +1281,11 @@ CONFIG_FLV_DEMUXER=yes
 CONFIG_LIVE_FLV_DEMUXER=yes
 CONFIG_FOURXM_DEMUXER=yes
 CONFIG_FRM_DEMUXER=yes
+CONFIG_FSB_DEMUXER=yes
 CONFIG_G722_DEMUXER=yes
 CONFIG_G723_1_DEMUXER=yes
 CONFIG_G729_DEMUXER=yes
+CONFIG_GENH_DEMUXER=yes
 CONFIG_GIF_DEMUXER=yes
 CONFIG_GSM_DEMUXER=yes
 CONFIG_GXF_DEMUXER=yes
@@ -1270,9 +1310,9 @@ CONFIG_IRCAM_DEMUXER=yes
 CONFIG_ISS_DEMUXER=yes
 CONFIG_IV8_DEMUXER=yes
 CONFIG_IVF_DEMUXER=yes
+CONFIG_IVR_DEMUXER=yes
 !CONFIG_JACOSUB_DEMUXER=yes
 CONFIG_JV_DEMUXER=yes
-CONFIG_LATM_DEMUXER=yes
 CONFIG_LMLM4_DEMUXER=yes
 CONFIG_LOAS_DEMUXER=yes
 CONFIG_LRC_DEMUXER=yes
@@ -1298,6 +1338,7 @@ CONFIG_MPEGVIDEO_DEMUXER=yes
 CONFIG_MPJPEG_DEMUXER=yes
 !CONFIG_MPL2_DEMUXER=yes
 CONFIG_MPSUB_DEMUXER=yes
+CONFIG_MSF_DEMUXER=yes
 CONFIG_MSNWC_TCP_DEMUXER=yes
 CONFIG_MTV_DEMUXER=yes
 CONFIG_MV_DEMUXER=yes
@@ -1370,22 +1411,28 @@ CONFIG_STL_DEMUXER=yes
 !CONFIG_SUBVIEWER1_DEMUXER=yes
 !CONFIG_SUBVIEWER_DEMUXER=yes
 CONFIG_SUP_DEMUXER=yes
+CONFIG_SVAG_DEMUXER=yes
 CONFIG_SWF_DEMUXER=yes
 CONFIG_TAK_DEMUXER=yes
 CONFIG_TEDCAPTIONS_DEMUXER=yes
 CONFIG_THP_DEMUXER=yes
+CONFIG_THREEDOSTR_DEMUXER=yes
 CONFIG_TIERTEXSEQ_DEMUXER=yes
 CONFIG_TMV_DEMUXER=yes
 CONFIG_TRUEHD_DEMUXER=yes
 CONFIG_TTA_DEMUXER=yes
 CONFIG_TXD_DEMUXER=yes
 CONFIG_TTY_DEMUXER=yes
+CONFIG_V210_DEMUXER=yes
+CONFIG_V210X_DEMUXER=yes
+CONFIG_VAG_DEMUXER=yes
 CONFIG_VC1_DEMUXER=yes
 CONFIG_VC1T_DEMUXER=yes
 CONFIG_VIVO_DEMUXER=yes
 CONFIG_VMD_DEMUXER=yes
 CONFIG_VOBSUB_DEMUXER=yes
 CONFIG_VOC_DEMUXER=yes
+CONFIG_VPK_DEMUXER=yes
 !CONFIG_VPLAYER_DEMUXER=yes
 CONFIG_VQF_DEMUXER=yes
 CONFIG_W64_DEMUXER=yes
@@ -1396,10 +1443,12 @@ CONFIG_WEBVTT_DEMUXER=yes
 CONFIG_WSAUD_DEMUXER=yes
 CONFIG_WSVQA_DEMUXER=yes
 CONFIG_WTV_DEMUXER=yes
+CONFIG_WVE_DEMUXER=yes
 CONFIG_WV_DEMUXER=yes
 CONFIG_XA_DEMUXER=yes
 CONFIG_XBIN_DEMUXER=yes
 CONFIG_XMV_DEMUXER=yes
+CONFIG_XVAG_DEMUXER=yes
 CONFIG_XWMA_DEMUXER=yes
 CONFIG_YOP_DEMUXER=yes
 CONFIG_YUV4MPEGPIPE_DEMUXER=yes
@@ -1420,7 +1469,6 @@ CONFIG_IMAGE_WEBP_PIPE_DEMUXER=yes
 !CONFIG_LIBGME_DEMUXER=yes
 !CONFIG_LIBMODPLUG_DEMUXER=yes
 !CONFIG_LIBNUT_DEMUXER=yes
-!CONFIG_LIBQUVI_DEMUXER=yes
 CONFIG_A64MULTI_ENCODER=yes
 CONFIG_A64MULTI5_ENCODER=yes
 CONFIG_ALIAS_PIX_ENCODER=yes
@@ -1488,6 +1536,8 @@ CONFIG_V210_ENCODER=yes
 CONFIG_V308_ENCODER=yes
 CONFIG_V408_ENCODER=yes
 CONFIG_V410_ENCODER=yes
+CONFIG_VC2_ENCODER=yes
+CONFIG_WRAPPED_AVFRAME_ENCODER=yes
 CONFIG_WMV1_ENCODER=yes
 CONFIG_WMV2_ENCODER=yes
 CONFIG_XBM_ENCODER=yes
@@ -1558,6 +1608,7 @@ CONFIG_DVDSUB_ENCODER=yes
 CONFIG_MOVTEXT_ENCODER=yes
 CONFIG_SRT_ENCODER=yes
 CONFIG_SUBRIP_ENCODER=yes
+CONFIG_TEXT_ENCODER=yes
 CONFIG_WEBVTT_ENCODER=yes
 CONFIG_XSUB_ENCODER=yes
 !CONFIG_LIBFAAC_ENCODER=yes
@@ -1575,7 +1626,6 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_LIBTHEORA_ENCODER=yes
 !CONFIG_LIBTWOLAME_ENCODER=yes
 !CONFIG_LIBUTVIDEO_ENCODER=yes
-!CONFIG_LIBVO_AACENC_ENCODER=yes
 !CONFIG_LIBVO_AMRWBENC_ENCODER=yes
 !CONFIG_LIBVORBIS_ENCODER=yes
 !CONFIG_LIBVPX_VP8_ENCODER=yes
@@ -1589,7 +1639,6 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_LIBX265_ENCODER=yes
 !CONFIG_LIBXAVS_ENCODER=yes
 !CONFIG_LIBXVID_ENCODER=yes
-!CONFIG_LIBAACPLUS_ENCODER=yes
 !CONFIG_LIBOPENH264_ENCODER=yes
 !CONFIG_H264_QSV_ENCODER=yes
 !CONFIG_NVENC_ENCODER=yes
@@ -1598,20 +1647,29 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_HEVC_QSV_ENCODER=yes
 !CONFIG_LIBKVAZAAR_ENCODER=yes
 !CONFIG_MPEG2_QSV_ENCODER=yes
+!CONFIG_ACOMPRESSOR_FILTER=yes
 !CONFIG_ACROSSFADE_FILTER=yes
 !CONFIG_ADELAY_FILTER=yes
 !CONFIG_AECHO_FILTER=yes
+!CONFIG_AEMPHASIS_FILTER=yes
 !CONFIG_AEVAL_FILTER=yes
 !CONFIG_AFADE_FILTER=yes
+!CONFIG_AFFTFILT_FILTER=yes
 !CONFIG_AFORMAT_FILTER=yes
+!CONFIG_AGATE_FILTER=yes
 !CONFIG_AINTERLEAVE_FILTER=yes
+!CONFIG_ALIMITER_FILTER=yes
 !CONFIG_ALLPASS_FILTER=yes
 !CONFIG_AMERGE_FILTER=yes
+!CONFIG_AMETADATA_FILTER=yes
 !CONFIG_AMIX_FILTER=yes
+!CONFIG_ANEQUALIZER_FILTER=yes
 !CONFIG_ANULL_FILTER=yes
 !CONFIG_APAD_FILTER=yes
 !CONFIG_APERMS_FILTER=yes
 !CONFIG_APHASER_FILTER=yes
+!CONFIG_APULSATOR_FILTER=yes
+!CONFIG_AREALTIME_FILTER=yes
 !CONFIG_ARESAMPLE_FILTER=yes
 !CONFIG_AREVERSE_FILTER=yes
 !CONFIG_ASELECT_FILTER=yes
@@ -1623,7 +1681,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_ASHOWINFO_FILTER=yes
 !CONFIG_ASPLIT_FILTER=yes
 !CONFIG_ASTATS_FILTER=yes
-!CONFIG_ASTREAMSYNC_FILTER=yes
+!CONFIG_ASTREAMSELECT_FILTER=yes
 !CONFIG_ASYNCTS_FILTER=yes
 !CONFIG_ATEMPO_FILTER=yes
 !CONFIG_ATRIM_FILTER=yes
@@ -1637,11 +1695,13 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_CHANNELSPLIT_FILTER=yes
 !CONFIG_CHORUS_FILTER=yes
 !CONFIG_COMPAND_FILTER=yes
+!CONFIG_COMPENSATIONDELAY_FILTER=yes
 !CONFIG_DCSHIFT_FILTER=yes
 !CONFIG_DYNAUDNORM_FILTER=yes
 !CONFIG_EARWAX_FILTER=yes
 !CONFIG_EBUR128_FILTER=yes
 !CONFIG_EQUALIZER_FILTER=yes
+!CONFIG_EXTRASTEREO_FILTER=yes
 !CONFIG_FLANGER_FILTER=yes
 !CONFIG_HIGHPASS_FILTER=yes
 !CONFIG_JOIN_FILTER=yes
@@ -1650,13 +1710,21 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_PAN_FILTER=yes
 !CONFIG_REPLAYGAIN_FILTER=yes
 !CONFIG_RESAMPLE_FILTER=yes
+!CONFIG_RUBBERBAND_FILTER=yes
 !CONFIG_SIDECHAINCOMPRESS_FILTER=yes
+!CONFIG_SIDECHAINGATE_FILTER=yes
 !CONFIG_SILENCEDETECT_FILTER=yes
 !CONFIG_SILENCEREMOVE_FILTER=yes
+!CONFIG_SOFALIZER_FILTER=yes
+!CONFIG_STEREOTOOLS_FILTER=yes
+!CONFIG_STEREOWIDEN_FILTER=yes
 !CONFIG_TREBLE_FILTER=yes
+!CONFIG_TREMOLO_FILTER=yes
+!CONFIG_VIBRATO_FILTER=yes
 !CONFIG_VOLUME_FILTER=yes
 !CONFIG_VOLUMEDETECT_FILTER=yes
 !CONFIG_AEVALSRC_FILTER=yes
+!CONFIG_ANOISESRC_FILTER=yes
 !CONFIG_ANULLSRC_FILTER=yes
 !CONFIG_FLITE_FILTER=yes
 !CONFIG_SINE_FILTER=yes
@@ -1670,12 +1738,14 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_BLACKFRAME_FILTER=yes
 !CONFIG_BLEND_FILTER=yes
 !CONFIG_BOXBLUR_FILTER=yes
+!CONFIG_CHROMAKEY_FILTER=yes
 !CONFIG_CODECVIEW_FILTER=yes
 !CONFIG_COLORBALANCE_FILTER=yes
 !CONFIG_COLORCHANNELMIXER_FILTER=yes
 !CONFIG_COLORKEY_FILTER=yes
 !CONFIG_COLORLEVELS_FILTER=yes
 !CONFIG_COLORMATRIX_FILTER=yes
+!CONFIG_CONVOLUTION_FILTER=yes
 !CONFIG_COPY_FILTER=yes
 !CONFIG_COVER_RECT_FILTER=yes
 !CONFIG_CROP_FILTER=yes
@@ -1690,6 +1760,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_DESHAKE_FILTER=yes
 !CONFIG_DETELECINE_FILTER=yes
 !CONFIG_DILATION_FILTER=yes
+!CONFIG_DISPLACE_FILTER=yes
 !CONFIG_DRAWBOX_FILTER=yes
 !CONFIG_DRAWGRAPH_FILTER=yes
 !CONFIG_DRAWGRID_FILTER=yes
@@ -1733,13 +1804,17 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_LUT_FILTER=yes
 !CONFIG_LUTRGB_FILTER=yes
 !CONFIG_LUTYUV_FILTER=yes
+!CONFIG_MASKEDMERGE_FILTER=yes
 !CONFIG_MCDEINT_FILTER=yes
 !CONFIG_MERGEPLANES_FILTER=yes
+!CONFIG_METADATA_FILTER=yes
 !CONFIG_MPDECIMATE_FILTER=yes
 !CONFIG_NEGATE_FILTER=yes
+!CONFIG_NNEDI_FILTER=yes
 !CONFIG_NOFORMAT_FILTER=yes
 !CONFIG_NOISE_FILTER=yes
 !CONFIG_NULL_FILTER=yes
+!CONFIG_OCR_FILTER=yes
 !CONFIG_OCV_FILTER=yes
 !CONFIG_OVERLAY_FILTER=yes
 !CONFIG_OWDENOISE_FILTER=yes
@@ -1756,6 +1831,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_PULLUP_FILTER=yes
 !CONFIG_QP_FILTER=yes
 !CONFIG_RANDOM_FILTER=yes
+!CONFIG_REALTIME_FILTER=yes
 !CONFIG_REMOVEGRAIN_FILTER=yes
 !CONFIG_REMOVELOGO_FILTER=yes
 !CONFIG_REPEATFIELDS_FILTER=yes
@@ -1765,6 +1841,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_SCALE_FILTER=yes
 !CONFIG_SCALE2REF_FILTER=yes
 !CONFIG_SELECT_FILTER=yes
+!CONFIG_SELECTIVECOLOR_FILTER=yes
 !CONFIG_SENDCMD_FILTER=yes
 !CONFIG_SEPARATEFIELDS_FILTER=yes
 !CONFIG_SETDAR_FILTER=yes
@@ -1774,6 +1851,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_SETTB_FILTER=yes
 !CONFIG_SHOWINFO_FILTER=yes
 !CONFIG_SHOWPALETTE_FILTER=yes
+!CONFIG_SHUFFLEFRAMES_FILTER=yes
 !CONFIG_SHUFFLEPLANES_FILTER=yes
 !CONFIG_SIGNALSTATS_FILTER=yes
 !CONFIG_SMARTBLUR_FILTER=yes
@@ -1781,8 +1859,10 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_SPP_FILTER=yes
 !CONFIG_SSIM_FILTER=yes
 !CONFIG_STEREO3D_FILTER=yes
+!CONFIG_STREAMSELECT_FILTER=yes
 !CONFIG_SUBTITLES_FILTER=yes
 !CONFIG_SUPER2XSAI_FILTER=yes
+!CONFIG_SWAPRECT_FILTER=yes
 !CONFIG_SWAPUV_FILTER=yes
 !CONFIG_TBLEND_FILTER=yes
 !CONFIG_TELECINE_FILTER=yes
@@ -1805,6 +1885,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_YADIF_FILTER=yes
 !CONFIG_ZMQ_FILTER=yes
 !CONFIG_ZOOMPAN_FILTER=yes
+!CONFIG_ZSCALE_FILTER=yes
 !CONFIG_ALLRGB_FILTER=yes
 !CONFIG_ALLYUV_FILTER=yes
 !CONFIG_CELLAUTO_FILTER=yes
@@ -1819,21 +1900,24 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_SMPTEBARS_FILTER=yes
 !CONFIG_SMPTEHDBARS_FILTER=yes
 !CONFIG_TESTSRC_FILTER=yes
+!CONFIG_TESTSRC2_FILTER=yes
 !CONFIG_NULLSINK_FILTER=yes
 !CONFIG_ADRAWGRAPH_FILTER=yes
+!CONFIG_AHISTOGRAM_FILTER=yes
 !CONFIG_APHASEMETER_FILTER=yes
 !CONFIG_AVECTORSCOPE_FILTER=yes
 !CONFIG_CONCAT_FILTER=yes
 !CONFIG_SHOWCQT_FILTER=yes
 !CONFIG_SHOWFREQS_FILTER=yes
 !CONFIG_SHOWSPECTRUM_FILTER=yes
+!CONFIG_SHOWSPECTRUMPIC_FILTER=yes
 !CONFIG_SHOWVOLUME_FILTER=yes
 !CONFIG_SHOWWAVES_FILTER=yes
 !CONFIG_SHOWWAVESPIC_FILTER=yes
+!CONFIG_SPECTRUMSYNTH_FILTER=yes
 !CONFIG_AMOVIE_FILTER=yes
 !CONFIG_MOVIE_FILTER=yes
 !CONFIG_H263_VAAPI_HWACCEL=yes
-!CONFIG_H263_VDPAU_HWACCEL=yes
 !CONFIG_H263_VIDEOTOOLBOX_HWACCEL=yes
 !CONFIG_H264_D3D11VA_HWACCEL=yes
 !CONFIG_H264_DXVA2_HWACCEL=yes
@@ -1855,10 +1939,12 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_MPEG2_XVMC_HWACCEL=yes
 !CONFIG_MPEG2_D3D11VA_HWACCEL=yes
 !CONFIG_MPEG2_DXVA2_HWACCEL=yes
+!CONFIG_MPEG2_MMAL_HWACCEL=yes
 !CONFIG_MPEG2_QSV_HWACCEL=yes
 !CONFIG_MPEG2_VAAPI_HWACCEL=yes
 !CONFIG_MPEG2_VDPAU_HWACCEL=yes
 !CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL=yes
+!CONFIG_MPEG4_MMAL_HWACCEL=yes
 !CONFIG_MPEG4_VAAPI_HWACCEL=yes
 !CONFIG_MPEG4_VDPAU_HWACCEL=yes
 !CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL=yes
@@ -1866,7 +1952,11 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_VC1_DXVA2_HWACCEL=yes
 !CONFIG_VC1_VAAPI_HWACCEL=yes
 !CONFIG_VC1_VDPAU_HWACCEL=yes
+!CONFIG_VC1_MMAL_HWACCEL=yes
 !CONFIG_VC1_QSV_HWACCEL=yes
+!CONFIG_VP9_D3D11VA_HWACCEL=yes
+!CONFIG_VP9_DXVA2_HWACCEL=yes
+!CONFIG_VP9_VAAPI_HWACCEL=yes
 !CONFIG_WMV3_D3D11VA_HWACCEL=yes
 !CONFIG_WMV3_DXVA2_HWACCEL=yes
 !CONFIG_WMV3_VAAPI_HWACCEL=yes
@@ -2036,6 +2126,7 @@ CONFIG_WEBVTT_MUXER=yes
 CONFIG_WTV_MUXER=yes
 CONFIG_WV_MUXER=yes
 CONFIG_YUV4MPEGPIPE_MUXER=yes
+!CONFIG_CHROMAPRINT_MUXER=yes
 !CONFIG_LIBNUT_MUXER=yes
 !CONFIG_ALSA_OUTDEV=yes
 !CONFIG_CACA_OUTDEV=yes
@@ -2059,6 +2150,7 @@ CONFIG_DCA_PARSER=yes
 CONFIG_DIRAC_PARSER=yes
 CONFIG_DNXHD_PARSER=yes
 CONFIG_DPX_PARSER=yes
+CONFIG_DVAUDIO_PARSER=yes
 CONFIG_DVBSUB_PARSER=yes
 CONFIG_DVDSUB_PARSER=yes
 CONFIG_DVD_NAV_PARSER=yes
@@ -2116,6 +2208,7 @@ CONFIG_RTP_PROTOCOL=yes
 CONFIG_SRTP_PROTOCOL=yes
 CONFIG_SUBFILE_PROTOCOL=yes
 CONFIG_TCP_PROTOCOL=yes
+!CONFIG_TLS_SCHANNEL_PROTOCOL=yes
 !CONFIG_TLS_SECURETRANSPORT_PROTOCOL=yes
 !CONFIG_TLS_GNUTLS_PROTOCOL=yes
 !CONFIG_TLS_OPENSSL_PROTOCOL=yes
diff --git a/android/config-armv8-a.mak b/android/config-armv8-a.mak
index e326c4949e..5eb69cd9b6 100644
--- a/android/config-armv8-a.mak
+++ b/android/config-armv8-a.mak
@@ -12,6 +12,7 @@ DOCDIR=$(DESTDIR)${prefix}/share/doc/ffmpeg
 MANDIR=$(DESTDIR)${prefix}/share/man
 PKGCONFIGDIR=$(DESTDIR)${prefix}/lib/pkgconfig
 SRC_PATH=.
+SRC_LINK=.
 ifndef MAIN_MAKEFILE
 SRC_PATH:=$(SRC_PATH:.%=..%)
 endif
@@ -21,6 +22,7 @@ INTRINSICS=neon
 CC=../../prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin/aarch64-linux-android-gcc
 CXX=../../prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin/aarch64-linux-android-g++
 AS=../../prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin/aarch64-linux-android-gcc
+OBJCC=../../prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin/aarch64-linux-android-gcc
 LD=../../prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin/aarch64-linux-android-gcc
 DEPCC=../../prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin/aarch64-linux-android-gcc
 DEPCCFLAGS= $(CPPFLAGS)
@@ -38,9 +40,13 @@ LN_S=ln -s -f
 CPPFLAGS= --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-arm64 -isysroot ../../prebuilts/ndk/current/platforms/android-21/arch-arm64 -D_ISOC99_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Dstrtod=avpriv_strtod -DPIC -DZLIB_CONST
 CFLAGS=   -std=c99 -fomit-frame-pointer -fPIC -pthread -Wdeclaration-after-statement -Wall -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wwrite-strings -Wtype-limits -Wundef -Wmissing-prototypes -Wno-pointer-to-int-cast -Wstrict-prototypes -Wempty-body -Wno-parentheses -Wno-switch -Wno-format-zero-length -Wno-pointer-sign -O3 -fno-math-errno -fno-signed-zeros -fno-tree-vectorize -Werror=format-security -Werror=implicit-function-declaration -Werror=missing-prototypes -Werror=return-type -Werror=vla -Wformat -fdiagnostics-color=auto -Wno-maybe-uninitialized
 CXXFLAGS=  -D__STDC_CONSTANT_MACROS
+OBJCFLAGS=
 ASFLAGS=   -fPIC
 AS_C=-c
 AS_O=-o $@
+OBJCC_C=-c
+OBJCC_E=-E -o $@
+OBJCC_O=-o $@
 CC_C=-c
 CC_E=-E -o $@
 CC_O=-o $@
@@ -69,13 +75,13 @@ SLIBPREF=lib
 SLIBSUF=.so
 EXESUF=
 EXTRA_VERSION=
-CCDEP=$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< | sed -e "/^\#.*/d" -e "s,^[[:space:]]*$(*F)\\.o,$(@D)/$(*F).o," > $(@:.o=.d)
+CCDEP=
 CXXDEP=
-CCDEP_FLAGS=-MM
-ASDEP=$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< | sed -e "/^\#.*/d" -e "s,^[[:space:]]*$(*F)\\.o,$(@D)/$(*F).o," > $(@:.o=.d)
-ASDEP_FLAGS=-MM
-CC_DEPFLAGS=
-AS_DEPFLAGS=
+CCDEP_FLAGS=
+ASDEP=
+ASDEP_FLAGS=
+CC_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@
+AS_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@
 HOSTCC=gcc
 HOSTLD=gcc
 HOSTCFLAGS=  -std=c99 -Wall -O3
@@ -85,13 +91,13 @@ HOSTLDFLAGS=
 HOSTLIBS=-lm
 DEPHOSTCC=gcc
 DEPHOSTCCFLAGS= $(HOSTCCFLAGS)
-HOSTCCDEP=$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< | sed -e "/^\#.*/d" -e "s,^[[:space:]]*$(*F)\\.o,$(@D)/$(*F).o," > $(@:.o=.d)
-HOSTCCDEP_FLAGS=-MM
-HOSTCC_DEPFLAGS=
+HOSTCCDEP=
+HOSTCCDEP_FLAGS=
+HOSTCC_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@
 HOSTCC_C=-c
 HOSTCC_O=-o $@
 HOSTLD_O=-o $@
-TARGET_EXEC= 
+TARGET_EXEC=
 TARGET_PATH=$(CURDIR)
 TARGET_SAMPLES=$(SAMPLES)
 CFLAGS-ffplay=
@@ -113,33 +119,33 @@ SLIB_INSTALL_EXTRA_LIB=
 SLIB_INSTALL_EXTRA_SHLIB=
 SAMPLES:=$(FATE_SAMPLES)
 NOREDZONE_FLAGS=
-libavcodec_VERSION=56.60.100
-libavcodec_VERSION_MAJOR=56
-libavcodec_VERSION_MINOR=60
-libavdevice_VERSION=56.4.100
-libavdevice_VERSION_MAJOR=56
-libavdevice_VERSION_MINOR=4
-libavfilter_VERSION=5.40.101
-libavfilter_VERSION_MAJOR=5
-libavfilter_VERSION_MINOR=40
-libavformat_VERSION=56.40.101
-libavformat_VERSION_MAJOR=56
-libavformat_VERSION_MINOR=40
-libavresample_VERSION=2.1.0
-libavresample_VERSION_MAJOR=2
-libavresample_VERSION_MINOR=1
-libavutil_VERSION=54.31.100
-libavutil_VERSION_MAJOR=54
-libavutil_VERSION_MINOR=31
-libpostproc_VERSION=53.3.100
-libpostproc_VERSION_MAJOR=53
-libpostproc_VERSION_MINOR=3
-libswresample_VERSION=1.2.101
-libswresample_VERSION_MAJOR=1
-libswresample_VERSION_MINOR=2
-libswscale_VERSION=3.1.101
-libswscale_VERSION_MAJOR=3
-libswscale_VERSION_MINOR=1
+libavcodec_VERSION=57.24.102
+libavcodec_VERSION_MAJOR=57
+libavcodec_VERSION_MINOR=24
+libavdevice_VERSION=57.0.101
+libavdevice_VERSION_MAJOR=57
+libavdevice_VERSION_MINOR=0
+libavfilter_VERSION=6.31.100
+libavfilter_VERSION_MAJOR=6
+libavfilter_VERSION_MINOR=31
+libavformat_VERSION=57.25.100
+libavformat_VERSION_MAJOR=57
+libavformat_VERSION_MINOR=25
+libavresample_VERSION=3.0.0
+libavresample_VERSION_MAJOR=3
+libavresample_VERSION_MINOR=0
+libavutil_VERSION=55.17.103
+libavutil_VERSION_MAJOR=55
+libavutil_VERSION_MINOR=17
+libpostproc_VERSION=54.0.100
+libpostproc_VERSION_MAJOR=54
+libpostproc_VERSION_MINOR=0
+libswresample_VERSION=2.0.101
+libswresample_VERSION_MAJOR=2
+libswresample_VERSION_MINOR=0
+libswscale_VERSION=4.0.100
+libswscale_VERSION_MAJOR=4
+libswscale_VERSION_MINOR=0
 avcodec_FFLIBS=swresample avutil
 avdevice_FFLIBS=avformat avcodec swresample avutil
 avfilter_FFLIBS= avutil
@@ -191,6 +197,7 @@ HAVE_VFP=yes
 !HAVE_POWER8=yes
 !HAVE_PPC4XX=yes
 !HAVE_VSX=yes
+!HAVE_AESNI=yes
 !HAVE_AMD3DNOW=yes
 !HAVE_AMD3DNOWEXT=yes
 !HAVE_AVX=yes
@@ -210,9 +217,10 @@ HAVE_VFP=yes
 !HAVE_I686=yes
 !HAVE_MIPSFPU=yes
 !HAVE_MIPS32R2=yes
-!HAVE_MIPS32R5=yes
+!HAVE_MIPS64R2=yes
+!HAVE_MIPS32R6=yes
 !HAVE_MIPS64R6=yes
-!HAVE_MIPSDSPR1=yes
+!HAVE_MIPSDSP=yes
 !HAVE_MIPSDSPR2=yes
 !HAVE_MSA=yes
 HAVE_LOONGSON2=yes
@@ -232,6 +240,7 @@ HAVE_VFP_EXTERNAL=yes
 !HAVE_POWER8_EXTERNAL=yes
 !HAVE_PPC4XX_EXTERNAL=yes
 !HAVE_VSX_EXTERNAL=yes
+!HAVE_AESNI_EXTERNAL=yes
 !HAVE_AMD3DNOW_EXTERNAL=yes
 !HAVE_AMD3DNOWEXT_EXTERNAL=yes
 !HAVE_AVX_EXTERNAL=yes
@@ -251,9 +260,10 @@ HAVE_VFP_EXTERNAL=yes
 !HAVE_I686_EXTERNAL=yes
 !HAVE_MIPSFPU_EXTERNAL=yes
 !HAVE_MIPS32R2_EXTERNAL=yes
-!HAVE_MIPS32R5_EXTERNAL=yes
+!HAVE_MIPS64R2_EXTERNAL=yes
+!HAVE_MIPS32R6_EXTERNAL=yes
 !HAVE_MIPS64R6_EXTERNAL=yes
-!HAVE_MIPSDSPR1_EXTERNAL=yes
+!HAVE_MIPSDSP_EXTERNAL=yes
 !HAVE_MIPSDSPR2_EXTERNAL=yes
 !HAVE_MSA_EXTERNAL=yes
 !HAVE_LOONGSON2_EXTERNAL=yes
@@ -273,6 +283,7 @@ HAVE_VFP_INLINE=yes
 !HAVE_POWER8_INLINE=yes
 !HAVE_PPC4XX_INLINE=yes
 !HAVE_VSX_INLINE=yes
+!HAVE_AESNI_INLINE=yes
 !HAVE_AMD3DNOW_INLINE=yes
 !HAVE_AMD3DNOWEXT_INLINE=yes
 !HAVE_AVX_INLINE=yes
@@ -292,9 +303,10 @@ HAVE_VFP_INLINE=yes
 !HAVE_I686_INLINE=yes
 !HAVE_MIPSFPU_INLINE=yes
 !HAVE_MIPS32R2_INLINE=yes
-!HAVE_MIPS32R5_INLINE=yes
+!HAVE_MIPS64R2_INLINE=yes
+!HAVE_MIPS32R6_INLINE=yes
 !HAVE_MIPS64R6_INLINE=yes
-!HAVE_MIPSDSPR1_INLINE=yes
+!HAVE_MIPSDSP_INLINE=yes
 !HAVE_MIPSDSPR2_INLINE=yes
 !HAVE_MSA_INLINE=yes
 !HAVE_LOONGSON2_INLINE=yes
@@ -319,6 +331,8 @@ HAVE_ATOMIC_COMPARE_EXCHANGE=yes
 !HAVE_RDTSC=yes
 HAVE_SARESTART=yes
 HAVE_SYNC_VAL_COMPARE_AND_SWAP=yes
+!HAVE_CABS=yes
+!HAVE_CEXP=yes
 HAVE_INLINE_ASM=yes
 !HAVE_SYMVER=yes
 !HAVE_YASM=yes
@@ -348,6 +362,9 @@ HAVE_DLFCN_H=yes
 !HAVE_MACHINE_IOCTL_BT848_H=yes
 !HAVE_MACHINE_IOCTL_METEOR_H=yes
 HAVE_MALLOC_H=yes
+!HAVE_OPENCV2_CORE_CORE_C_H=yes
+!HAVE_OPENJPEG_2_1_OPENJPEG_H=yes
+!HAVE_OPENJPEG_2_0_OPENJPEG_H=yes
 !HAVE_OPENJPEG_1_5_OPENJPEG_H=yes
 !HAVE_OPENGL_GL3_H=yes
 HAVE_POLL_H=yes
@@ -378,6 +395,8 @@ HAVE_ERF=yes
 HAVE_EXP2=yes
 HAVE_EXP2F=yes
 HAVE_EXPF=yes
+HAVE_HYPOT=yes
+HAVE_ISFINITE=yes
 HAVE_ISINF=yes
 HAVE_ISNAN=yes
 HAVE_LDEXPF=yes
@@ -397,6 +416,7 @@ HAVE_TRUNC=yes
 HAVE_TRUNCF=yes
 HAVE_ACCESS=yes
 !HAVE_ALIGNED_MALLOC=yes
+HAVE_ARC4RANDOM=yes
 HAVE_CLOCK_GETTIME=yes
 !HAVE_CLOSESOCKET=yes
 !HAVE_COMMANDLINETOARGVW=yes
@@ -413,7 +433,6 @@ HAVE_GETOPT=yes
 !HAVE_GETPROCESSMEMORYINFO=yes
 !HAVE_GETPROCESSTIMES=yes
 HAVE_GETRUSAGE=yes
-HAVE_GETSERVBYPORT=yes
 !HAVE_GETSYSTEMTIMEASFILETIME=yes
 HAVE_GETTIMEOFDAY=yes
 !HAVE_GLOB=yes
@@ -446,6 +465,7 @@ HAVE_STRERROR_R=yes
 HAVE_SYSCONF=yes
 !HAVE_SYSCTL=yes
 HAVE_USLEEP=yes
+!HAVE_UTGETOSTYPEFROMSTRING=yes
 !HAVE_VIRTUALALLOC=yes
 !HAVE_WGLGETPROCADDRESS=yes
 HAVE_PTHREADS=yes
@@ -462,9 +482,9 @@ HAVE_ATTRIBUTE_PACKED=yes
 HAVE_GNU_AS=yes
 !HAVE_GNU_WINDRES=yes
 !HAVE_IBM_ASM=yes
+!HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS=yes
 HAVE_INLINE_ASM_LABELS=yes
 HAVE_INLINE_ASM_NONLOCAL_LABELS=yes
-!HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS=yes
 HAVE_PRAGMA_DEPRECATED=yes
 HAVE_RSYNC_CONTIMEOUT=yes
 !HAVE_SYMVER_ASM_LABEL=yes
@@ -475,7 +495,6 @@ HAVE_SYMVER_GNU_ASM=yes
 !HAVE_CONDITION_VARIABLE_PTR=yes
 HAVE_SOCKLEN_T=yes
 HAVE_STRUCT_ADDRINFO=yes
-!HAVE_STRUCT_DCADEC_EXSS_INFO_MATRIX_ENCODING=yes
 HAVE_STRUCT_GROUP_SOURCE_REQ=yes
 HAVE_STRUCT_IP_MREQ_SOURCE=yes
 HAVE_STRUCT_IPV6_MREQ=yes
@@ -489,8 +508,8 @@ HAVE_STRUCT_SOCKADDR_STORAGE=yes
 HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE=yes
 HAVE_ATOMICS_NATIVE=yes
 !HAVE_DOS_PATHS=yes
-!HAVE_DXVA2API_COBJ=yes
 !HAVE_DXVA2_LIB=yes
+!HAVE_DXVA2API_COBJ=yes
 !HAVE_LIBC_MSVCRT=yes
 !HAVE_LIBDC1394_1=yes
 !HAVE_LIBDC1394_2=yes
@@ -504,17 +523,18 @@ HAVE_SECTION_DATA_REL_RO=yes
 HAVE_THREADS=yes
 !HAVE_VAAPI_X11=yes
 !HAVE_VDPAU_X11=yes
+!HAVE_WINRT=yes
 !HAVE_XLIB=yes
 CONFIG_BSFS=yes
 CONFIG_DECODERS=yes
-CONFIG_DEMUXERS=yes
 CONFIG_ENCODERS=yes
-!CONFIG_FILTERS=yes
 !CONFIG_HWACCELS=yes
+CONFIG_PARSERS=yes
 !CONFIG_INDEVS=yes
-CONFIG_MUXERS=yes
 !CONFIG_OUTDEVS=yes
-CONFIG_PARSERS=yes
+!CONFIG_FILTERS=yes
+CONFIG_DEMUXERS=yes
+CONFIG_MUXERS=yes
 CONFIG_PROTOCOLS=yes
 !CONFIG_DOC=yes
 !CONFIG_HTMLPAGES=yes
@@ -539,13 +559,15 @@ CONFIG_TRANSCODE_AAC_EXAMPLE=yes
 CONFIG_TRANSCODING_EXAMPLE=yes
 !CONFIG_AVISYNTH=yes
 !CONFIG_BZLIB=yes
+!CONFIG_CHROMAPRINT=yes
 !CONFIG_CRYSTALHD=yes
 !CONFIG_DECKLINK=yes
 !CONFIG_FREI0R=yes
+!CONFIG_GCRYPT=yes
+!CONFIG_GMP=yes
 !CONFIG_GNUTLS=yes
 !CONFIG_ICONV=yes
 !CONFIG_LADSPA=yes
-!CONFIG_LIBAACPLUS=yes
 !CONFIG_LIBASS=yes
 !CONFIG_LIBBLURAY=yes
 !CONFIG_LIBBS2B=yes
@@ -576,8 +598,8 @@ CONFIG_TRANSCODING_EXAMPLE=yes
 !CONFIG_LIBOPENJPEG=yes
 !CONFIG_LIBOPUS=yes
 !CONFIG_LIBPULSE=yes
-!CONFIG_LIBQUVI=yes
 !CONFIG_LIBRTMP=yes
+!CONFIG_LIBRUBBERBAND=yes
 !CONFIG_LIBSCHROEDINGER=yes
 !CONFIG_LIBSHINE=yes
 !CONFIG_LIBSMBCLIENT=yes
@@ -585,13 +607,12 @@ CONFIG_TRANSCODING_EXAMPLE=yes
 !CONFIG_LIBSOXR=yes
 !CONFIG_LIBSPEEX=yes
 !CONFIG_LIBSSH=yes
-!CONFIG_LIBSTAGEFRIGHT_H264=yes
+!CONFIG_LIBTESSERACT=yes
 !CONFIG_LIBTHEORA=yes
 !CONFIG_LIBTWOLAME=yes
 !CONFIG_LIBUTVIDEO=yes
 !CONFIG_LIBV4L2=yes
 !CONFIG_LIBVIDSTAB=yes
-!CONFIG_LIBVO_AACENC=yes
 !CONFIG_LIBVO_AMRWBENC=yes
 !CONFIG_LIBVORBIS=yes
 !CONFIG_LIBVPX=yes
@@ -605,15 +626,18 @@ CONFIG_TRANSCODING_EXAMPLE=yes
 !CONFIG_LIBXCB_SHAPE=yes
 !CONFIG_LIBXCB_XFIXES=yes
 !CONFIG_LIBXVID=yes
+!CONFIG_LIBZIMG=yes
 !CONFIG_LIBZMQ=yes
 !CONFIG_LIBZVBI=yes
 !CONFIG_LZMA=yes
 !CONFIG_MMAL=yes
+!CONFIG_NETCDF=yes
 !CONFIG_NVENC=yes
 !CONFIG_OPENAL=yes
 !CONFIG_OPENCL=yes
 !CONFIG_OPENGL=yes
 !CONFIG_OPENSSL=yes
+!CONFIG_SCHANNEL=yes
 !CONFIG_SDL=yes
 !CONFIG_SECURETRANSPORT=yes
 !CONFIG_X11GRAB=yes
@@ -681,6 +705,7 @@ CONFIG_AUDIODSP=yes
 CONFIG_BLOCKDSP=yes
 CONFIG_BSWAPDSP=yes
 CONFIG_CABAC=yes
+CONFIG_DIRAC_PARSE=yes
 CONFIG_DVPROFILE=yes
 CONFIG_EXIF=yes
 CONFIG_FAANDCT=yes
@@ -690,8 +715,6 @@ CONFIG_FLACDSP=yes
 CONFIG_FMTCONVERT=yes
 CONFIG_FRAME_THREAD_ENCODER=yes
 CONFIG_G722DSP=yes
-!CONFIG_GCRYPT=yes
-!CONFIG_GMP=yes
 CONFIG_GOLOMB=yes
 !CONFIG_GPLV3=yes
 CONFIG_H263DSP=yes
@@ -709,11 +732,12 @@ CONFIG_IMDCT15=yes
 CONFIG_INTRAX8=yes
 CONFIG_IVIDSP=yes
 CONFIG_JPEGTABLES=yes
-!CONFIG_LIBX262=yes
 !CONFIG_LGPLV3=yes
+!CONFIG_LIBX262=yes
 CONFIG_LLAUDDSP=yes
 CONFIG_LLVIDDSP=yes
 CONFIG_LPC=yes
+CONFIG_LZF=yes
 CONFIG_ME_CMP=yes
 CONFIG_MPEG_ER=yes
 CONFIG_MPEGAUDIO=yes
@@ -784,6 +808,7 @@ CONFIG_C93_DECODER=yes
 CONFIG_CAVS_DECODER=yes
 CONFIG_CDGRAPHICS_DECODER=yes
 CONFIG_CDXL_DECODER=yes
+CONFIG_CFHD_DECODER=yes
 CONFIG_CINEPAK_DECODER=yes
 CONFIG_CLJR_DECODER=yes
 CONFIG_CLLC_DECODER=yes
@@ -797,9 +822,11 @@ CONFIG_DIRAC_DECODER=yes
 CONFIG_DNXHD_DECODER=yes
 CONFIG_DPX_DECODER=yes
 CONFIG_DSICINVIDEO_DECODER=yes
+CONFIG_DVAUDIO_DECODER=yes
 CONFIG_DVVIDEO_DECODER=yes
 CONFIG_DXA_DECODER=yes
 CONFIG_DXTORY_DECODER=yes
+CONFIG_DXV_DECODER=yes
 CONFIG_EACMV_DECODER=yes
 CONFIG_EAMAD_DECODER=yes
 CONFIG_EATGQ_DECODER=yes
@@ -841,7 +868,6 @@ CONFIG_HQ_HQA_DECODER=yes
 CONFIG_HQX_DECODER=yes
 CONFIG_HUFFYUV_DECODER=yes
 CONFIG_IDCIN_DECODER=yes
-CONFIG_IFF_BYTERUN1_DECODER=yes
 CONFIG_IFF_ILBM_DECODER=yes
 CONFIG_INDEO2_DECODER=yes
 CONFIG_INDEO3_DECODER=yes
@@ -866,10 +892,12 @@ CONFIG_MPEG1VIDEO_DECODER=yes
 CONFIG_MPEG2VIDEO_DECODER=yes
 CONFIG_MPEG4_DECODER=yes
 !CONFIG_MPEG4_CRYSTALHD_DECODER=yes
+!CONFIG_MPEG4_MMAL_DECODER=yes
 !CONFIG_MPEG4_VDPAU_DECODER=yes
 CONFIG_MPEGVIDEO_DECODER=yes
 !CONFIG_MPEG_VDPAU_DECODER=yes
 !CONFIG_MPEG1_VDPAU_DECODER=yes
+!CONFIG_MPEG2_MMAL_DECODER=yes
 !CONFIG_MPEG2_CRYSTALHD_DECODER=yes
 !CONFIG_MPEG2_QSV_DECODER=yes
 CONFIG_MSA1_DECODER=yes
@@ -908,12 +936,15 @@ CONFIG_RAWVIDEO_DECODER=yes
 CONFIG_RL2_DECODER=yes
 CONFIG_ROQ_DECODER=yes
 CONFIG_RPZA_DECODER=yes
+CONFIG_RSCC_DECODER=yes
 CONFIG_RV10_DECODER=yes
 CONFIG_RV20_DECODER=yes
 CONFIG_RV30_DECODER=yes
 CONFIG_RV40_DECODER=yes
 CONFIG_S302M_DECODER=yes
 CONFIG_SANM_DECODER=yes
+CONFIG_SCREENPRESSO_DECODER=yes
+CONFIG_SDX2_DPCM_DECODER=yes
 CONFIG_SGI_DECODER=yes
 CONFIG_SGIRLE_DECODER=yes
 CONFIG_SMACKER_DECODER=yes
@@ -950,6 +981,7 @@ CONFIG_VC1_DECODER=yes
 !CONFIG_VC1_CRYSTALHD_DECODER=yes
 !CONFIG_VC1_VDPAU_DECODER=yes
 CONFIG_VC1IMAGE_DECODER=yes
+!CONFIG_VC1_MMAL_DECODER=yes
 !CONFIG_VC1_QSV_DECODER=yes
 CONFIG_VCR1_DECODER=yes
 CONFIG_VMDVIDEO_DECODER=yes
@@ -1018,6 +1050,7 @@ CONFIG_GSM_DECODER=yes
 CONFIG_GSM_MS_DECODER=yes
 CONFIG_IAC_DECODER=yes
 CONFIG_IMC_DECODER=yes
+CONFIG_INTERPLAY_ACM_DECODER=yes
 CONFIG_MACE3_DECODER=yes
 CONFIG_MACE6_DECODER=yes
 CONFIG_METASOUND_DECODER=yes
@@ -1061,6 +1094,8 @@ CONFIG_WMAV1_DECODER=yes
 CONFIG_WMAV2_DECODER=yes
 CONFIG_WMAVOICE_DECODER=yes
 CONFIG_WS_SND1_DECODER=yes
+CONFIG_XMA1_DECODER=yes
+CONFIG_XMA2_DECODER=yes
 CONFIG_PCM_ALAW_DECODER=yes
 CONFIG_PCM_BLURAY_DECODER=yes
 CONFIG_PCM_DVD_DECODER=yes
@@ -1098,6 +1133,7 @@ CONFIG_XAN_DPCM_DECODER=yes
 CONFIG_ADPCM_4XM_DECODER=yes
 CONFIG_ADPCM_ADX_DECODER=yes
 CONFIG_ADPCM_AFC_DECODER=yes
+CONFIG_ADPCM_AICA_DECODER=yes
 CONFIG_ADPCM_CT_DECODER=yes
 CONFIG_ADPCM_DTK_DECODER=yes
 CONFIG_ADPCM_EA_DECODER=yes
@@ -1123,6 +1159,7 @@ CONFIG_ADPCM_IMA_SMJPEG_DECODER=yes
 CONFIG_ADPCM_IMA_WAV_DECODER=yes
 CONFIG_ADPCM_IMA_WS_DECODER=yes
 CONFIG_ADPCM_MS_DECODER=yes
+CONFIG_ADPCM_PSX_DECODER=yes
 CONFIG_ADPCM_SBPRO_2_DECODER=yes
 CONFIG_ADPCM_SBPRO_3_DECODER=yes
 CONFIG_ADPCM_SBPRO_4_DECODER=yes
@@ -1132,7 +1169,6 @@ CONFIG_ADPCM_THP_LE_DECODER=yes
 CONFIG_ADPCM_VIMA_DECODER=yes
 CONFIG_ADPCM_XA_DECODER=yes
 CONFIG_ADPCM_YAMAHA_DECODER=yes
-CONFIG_VIMA_DECODER=yes
 CONFIG_SSA_DECODER=yes
 !CONFIG_ASS_DECODER=yes
 CONFIG_CCAPTION_DECODER=yes
@@ -1167,7 +1203,6 @@ CONFIG_XSUB_DECODER=yes
 !CONFIG_LIBOPUS_DECODER=yes
 !CONFIG_LIBSCHROEDINGER_DECODER=yes
 !CONFIG_LIBSPEEX_DECODER=yes
-!CONFIG_LIBSTAGEFRIGHT_H264_DECODER=yes
 !CONFIG_LIBUTVIDEO_DECODER=yes
 !CONFIG_LIBVORBIS_DECODER=yes
 !CONFIG_LIBVPX_VP8_DECODER=yes
@@ -1179,9 +1214,11 @@ CONFIG_IDF_DECODER=yes
 CONFIG_AA_DEMUXER=yes
 CONFIG_AAC_DEMUXER=yes
 CONFIG_AC3_DEMUXER=yes
+CONFIG_ACM_DEMUXER=yes
 CONFIG_ACT_DEMUXER=yes
 CONFIG_ADF_DEMUXER=yes
 CONFIG_ADP_DEMUXER=yes
+CONFIG_ADS_DEMUXER=yes
 CONFIG_ADX_DEMUXER=yes
 CONFIG_AEA_DEMUXER=yes
 CONFIG_AFC_DEMUXER=yes
@@ -1219,6 +1256,7 @@ CONFIG_CINE_DEMUXER=yes
 CONFIG_CONCAT_DEMUXER=yes
 CONFIG_DATA_DEMUXER=yes
 CONFIG_DAUD_DEMUXER=yes
+CONFIG_DCSTR_DEMUXER=yes
 CONFIG_DFA_DEMUXER=yes
 CONFIG_DIRAC_DEMUXER=yes
 CONFIG_DNXHD_DEMUXER=yes
@@ -1243,9 +1281,11 @@ CONFIG_FLV_DEMUXER=yes
 CONFIG_LIVE_FLV_DEMUXER=yes
 CONFIG_FOURXM_DEMUXER=yes
 CONFIG_FRM_DEMUXER=yes
+CONFIG_FSB_DEMUXER=yes
 CONFIG_G722_DEMUXER=yes
 CONFIG_G723_1_DEMUXER=yes
 CONFIG_G729_DEMUXER=yes
+CONFIG_GENH_DEMUXER=yes
 CONFIG_GIF_DEMUXER=yes
 CONFIG_GSM_DEMUXER=yes
 CONFIG_GXF_DEMUXER=yes
@@ -1270,9 +1310,9 @@ CONFIG_IRCAM_DEMUXER=yes
 CONFIG_ISS_DEMUXER=yes
 CONFIG_IV8_DEMUXER=yes
 CONFIG_IVF_DEMUXER=yes
+CONFIG_IVR_DEMUXER=yes
 !CONFIG_JACOSUB_DEMUXER=yes
 CONFIG_JV_DEMUXER=yes
-CONFIG_LATM_DEMUXER=yes
 CONFIG_LMLM4_DEMUXER=yes
 CONFIG_LOAS_DEMUXER=yes
 CONFIG_LRC_DEMUXER=yes
@@ -1298,6 +1338,7 @@ CONFIG_MPEGVIDEO_DEMUXER=yes
 CONFIG_MPJPEG_DEMUXER=yes
 !CONFIG_MPL2_DEMUXER=yes
 CONFIG_MPSUB_DEMUXER=yes
+CONFIG_MSF_DEMUXER=yes
 CONFIG_MSNWC_TCP_DEMUXER=yes
 CONFIG_MTV_DEMUXER=yes
 CONFIG_MV_DEMUXER=yes
@@ -1370,22 +1411,28 @@ CONFIG_STL_DEMUXER=yes
 !CONFIG_SUBVIEWER1_DEMUXER=yes
 !CONFIG_SUBVIEWER_DEMUXER=yes
 CONFIG_SUP_DEMUXER=yes
+CONFIG_SVAG_DEMUXER=yes
 CONFIG_SWF_DEMUXER=yes
 CONFIG_TAK_DEMUXER=yes
 CONFIG_TEDCAPTIONS_DEMUXER=yes
 CONFIG_THP_DEMUXER=yes
+CONFIG_THREEDOSTR_DEMUXER=yes
 CONFIG_TIERTEXSEQ_DEMUXER=yes
 CONFIG_TMV_DEMUXER=yes
 CONFIG_TRUEHD_DEMUXER=yes
 CONFIG_TTA_DEMUXER=yes
 CONFIG_TXD_DEMUXER=yes
 CONFIG_TTY_DEMUXER=yes
+CONFIG_V210_DEMUXER=yes
+CONFIG_V210X_DEMUXER=yes
+CONFIG_VAG_DEMUXER=yes
 CONFIG_VC1_DEMUXER=yes
 CONFIG_VC1T_DEMUXER=yes
 CONFIG_VIVO_DEMUXER=yes
 CONFIG_VMD_DEMUXER=yes
 CONFIG_VOBSUB_DEMUXER=yes
 CONFIG_VOC_DEMUXER=yes
+CONFIG_VPK_DEMUXER=yes
 !CONFIG_VPLAYER_DEMUXER=yes
 CONFIG_VQF_DEMUXER=yes
 CONFIG_W64_DEMUXER=yes
@@ -1396,10 +1443,12 @@ CONFIG_WEBVTT_DEMUXER=yes
 CONFIG_WSAUD_DEMUXER=yes
 CONFIG_WSVQA_DEMUXER=yes
 CONFIG_WTV_DEMUXER=yes
+CONFIG_WVE_DEMUXER=yes
 CONFIG_WV_DEMUXER=yes
 CONFIG_XA_DEMUXER=yes
 CONFIG_XBIN_DEMUXER=yes
 CONFIG_XMV_DEMUXER=yes
+CONFIG_XVAG_DEMUXER=yes
 CONFIG_XWMA_DEMUXER=yes
 CONFIG_YOP_DEMUXER=yes
 CONFIG_YUV4MPEGPIPE_DEMUXER=yes
@@ -1420,7 +1469,6 @@ CONFIG_IMAGE_WEBP_PIPE_DEMUXER=yes
 !CONFIG_LIBGME_DEMUXER=yes
 !CONFIG_LIBMODPLUG_DEMUXER=yes
 !CONFIG_LIBNUT_DEMUXER=yes
-!CONFIG_LIBQUVI_DEMUXER=yes
 CONFIG_A64MULTI_ENCODER=yes
 CONFIG_A64MULTI5_ENCODER=yes
 CONFIG_ALIAS_PIX_ENCODER=yes
@@ -1488,6 +1536,8 @@ CONFIG_V210_ENCODER=yes
 CONFIG_V308_ENCODER=yes
 CONFIG_V408_ENCODER=yes
 CONFIG_V410_ENCODER=yes
+CONFIG_VC2_ENCODER=yes
+CONFIG_WRAPPED_AVFRAME_ENCODER=yes
 CONFIG_WMV1_ENCODER=yes
 CONFIG_WMV2_ENCODER=yes
 CONFIG_XBM_ENCODER=yes
@@ -1558,6 +1608,7 @@ CONFIG_DVDSUB_ENCODER=yes
 CONFIG_MOVTEXT_ENCODER=yes
 CONFIG_SRT_ENCODER=yes
 CONFIG_SUBRIP_ENCODER=yes
+CONFIG_TEXT_ENCODER=yes
 CONFIG_WEBVTT_ENCODER=yes
 CONFIG_XSUB_ENCODER=yes
 !CONFIG_LIBFAAC_ENCODER=yes
@@ -1575,7 +1626,6 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_LIBTHEORA_ENCODER=yes
 !CONFIG_LIBTWOLAME_ENCODER=yes
 !CONFIG_LIBUTVIDEO_ENCODER=yes
-!CONFIG_LIBVO_AACENC_ENCODER=yes
 !CONFIG_LIBVO_AMRWBENC_ENCODER=yes
 !CONFIG_LIBVORBIS_ENCODER=yes
 !CONFIG_LIBVPX_VP8_ENCODER=yes
@@ -1589,7 +1639,6 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_LIBX265_ENCODER=yes
 !CONFIG_LIBXAVS_ENCODER=yes
 !CONFIG_LIBXVID_ENCODER=yes
-!CONFIG_LIBAACPLUS_ENCODER=yes
 !CONFIG_LIBOPENH264_ENCODER=yes
 !CONFIG_H264_QSV_ENCODER=yes
 !CONFIG_NVENC_ENCODER=yes
@@ -1598,20 +1647,29 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_HEVC_QSV_ENCODER=yes
 !CONFIG_LIBKVAZAAR_ENCODER=yes
 !CONFIG_MPEG2_QSV_ENCODER=yes
+!CONFIG_ACOMPRESSOR_FILTER=yes
 !CONFIG_ACROSSFADE_FILTER=yes
 !CONFIG_ADELAY_FILTER=yes
 !CONFIG_AECHO_FILTER=yes
+!CONFIG_AEMPHASIS_FILTER=yes
 !CONFIG_AEVAL_FILTER=yes
 !CONFIG_AFADE_FILTER=yes
+!CONFIG_AFFTFILT_FILTER=yes
 !CONFIG_AFORMAT_FILTER=yes
+!CONFIG_AGATE_FILTER=yes
 !CONFIG_AINTERLEAVE_FILTER=yes
+!CONFIG_ALIMITER_FILTER=yes
 !CONFIG_ALLPASS_FILTER=yes
 !CONFIG_AMERGE_FILTER=yes
+!CONFIG_AMETADATA_FILTER=yes
 !CONFIG_AMIX_FILTER=yes
+!CONFIG_ANEQUALIZER_FILTER=yes
 !CONFIG_ANULL_FILTER=yes
 !CONFIG_APAD_FILTER=yes
 !CONFIG_APERMS_FILTER=yes
 !CONFIG_APHASER_FILTER=yes
+!CONFIG_APULSATOR_FILTER=yes
+!CONFIG_AREALTIME_FILTER=yes
 !CONFIG_ARESAMPLE_FILTER=yes
 !CONFIG_AREVERSE_FILTER=yes
 !CONFIG_ASELECT_FILTER=yes
@@ -1623,7 +1681,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_ASHOWINFO_FILTER=yes
 !CONFIG_ASPLIT_FILTER=yes
 !CONFIG_ASTATS_FILTER=yes
-!CONFIG_ASTREAMSYNC_FILTER=yes
+!CONFIG_ASTREAMSELECT_FILTER=yes
 !CONFIG_ASYNCTS_FILTER=yes
 !CONFIG_ATEMPO_FILTER=yes
 !CONFIG_ATRIM_FILTER=yes
@@ -1637,11 +1695,13 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_CHANNELSPLIT_FILTER=yes
 !CONFIG_CHORUS_FILTER=yes
 !CONFIG_COMPAND_FILTER=yes
+!CONFIG_COMPENSATIONDELAY_FILTER=yes
 !CONFIG_DCSHIFT_FILTER=yes
 !CONFIG_DYNAUDNORM_FILTER=yes
 !CONFIG_EARWAX_FILTER=yes
 !CONFIG_EBUR128_FILTER=yes
 !CONFIG_EQUALIZER_FILTER=yes
+!CONFIG_EXTRASTEREO_FILTER=yes
 !CONFIG_FLANGER_FILTER=yes
 !CONFIG_HIGHPASS_FILTER=yes
 !CONFIG_JOIN_FILTER=yes
@@ -1650,13 +1710,21 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_PAN_FILTER=yes
 !CONFIG_REPLAYGAIN_FILTER=yes
 !CONFIG_RESAMPLE_FILTER=yes
+!CONFIG_RUBBERBAND_FILTER=yes
 !CONFIG_SIDECHAINCOMPRESS_FILTER=yes
+!CONFIG_SIDECHAINGATE_FILTER=yes
 !CONFIG_SILENCEDETECT_FILTER=yes
 !CONFIG_SILENCEREMOVE_FILTER=yes
+!CONFIG_SOFALIZER_FILTER=yes
+!CONFIG_STEREOTOOLS_FILTER=yes
+!CONFIG_STEREOWIDEN_FILTER=yes
 !CONFIG_TREBLE_FILTER=yes
+!CONFIG_TREMOLO_FILTER=yes
+!CONFIG_VIBRATO_FILTER=yes
 !CONFIG_VOLUME_FILTER=yes
 !CONFIG_VOLUMEDETECT_FILTER=yes
 !CONFIG_AEVALSRC_FILTER=yes
+!CONFIG_ANOISESRC_FILTER=yes
 !CONFIG_ANULLSRC_FILTER=yes
 !CONFIG_FLITE_FILTER=yes
 !CONFIG_SINE_FILTER=yes
@@ -1670,12 +1738,14 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_BLACKFRAME_FILTER=yes
 !CONFIG_BLEND_FILTER=yes
 !CONFIG_BOXBLUR_FILTER=yes
+!CONFIG_CHROMAKEY_FILTER=yes
 !CONFIG_CODECVIEW_FILTER=yes
 !CONFIG_COLORBALANCE_FILTER=yes
 !CONFIG_COLORCHANNELMIXER_FILTER=yes
 !CONFIG_COLORKEY_FILTER=yes
 !CONFIG_COLORLEVELS_FILTER=yes
 !CONFIG_COLORMATRIX_FILTER=yes
+!CONFIG_CONVOLUTION_FILTER=yes
 !CONFIG_COPY_FILTER=yes
 !CONFIG_COVER_RECT_FILTER=yes
 !CONFIG_CROP_FILTER=yes
@@ -1690,6 +1760,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_DESHAKE_FILTER=yes
 !CONFIG_DETELECINE_FILTER=yes
 !CONFIG_DILATION_FILTER=yes
+!CONFIG_DISPLACE_FILTER=yes
 !CONFIG_DRAWBOX_FILTER=yes
 !CONFIG_DRAWGRAPH_FILTER=yes
 !CONFIG_DRAWGRID_FILTER=yes
@@ -1733,13 +1804,17 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_LUT_FILTER=yes
 !CONFIG_LUTRGB_FILTER=yes
 !CONFIG_LUTYUV_FILTER=yes
+!CONFIG_MASKEDMERGE_FILTER=yes
 !CONFIG_MCDEINT_FILTER=yes
 !CONFIG_MERGEPLANES_FILTER=yes
+!CONFIG_METADATA_FILTER=yes
 !CONFIG_MPDECIMATE_FILTER=yes
 !CONFIG_NEGATE_FILTER=yes
+!CONFIG_NNEDI_FILTER=yes
 !CONFIG_NOFORMAT_FILTER=yes
 !CONFIG_NOISE_FILTER=yes
 !CONFIG_NULL_FILTER=yes
+!CONFIG_OCR_FILTER=yes
 !CONFIG_OCV_FILTER=yes
 !CONFIG_OVERLAY_FILTER=yes
 !CONFIG_OWDENOISE_FILTER=yes
@@ -1756,6 +1831,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_PULLUP_FILTER=yes
 !CONFIG_QP_FILTER=yes
 !CONFIG_RANDOM_FILTER=yes
+!CONFIG_REALTIME_FILTER=yes
 !CONFIG_REMOVEGRAIN_FILTER=yes
 !CONFIG_REMOVELOGO_FILTER=yes
 !CONFIG_REPEATFIELDS_FILTER=yes
@@ -1765,6 +1841,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_SCALE_FILTER=yes
 !CONFIG_SCALE2REF_FILTER=yes
 !CONFIG_SELECT_FILTER=yes
+!CONFIG_SELECTIVECOLOR_FILTER=yes
 !CONFIG_SENDCMD_FILTER=yes
 !CONFIG_SEPARATEFIELDS_FILTER=yes
 !CONFIG_SETDAR_FILTER=yes
@@ -1774,6 +1851,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_SETTB_FILTER=yes
 !CONFIG_SHOWINFO_FILTER=yes
 !CONFIG_SHOWPALETTE_FILTER=yes
+!CONFIG_SHUFFLEFRAMES_FILTER=yes
 !CONFIG_SHUFFLEPLANES_FILTER=yes
 !CONFIG_SIGNALSTATS_FILTER=yes
 !CONFIG_SMARTBLUR_FILTER=yes
@@ -1781,8 +1859,10 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_SPP_FILTER=yes
 !CONFIG_SSIM_FILTER=yes
 !CONFIG_STEREO3D_FILTER=yes
+!CONFIG_STREAMSELECT_FILTER=yes
 !CONFIG_SUBTITLES_FILTER=yes
 !CONFIG_SUPER2XSAI_FILTER=yes
+!CONFIG_SWAPRECT_FILTER=yes
 !CONFIG_SWAPUV_FILTER=yes
 !CONFIG_TBLEND_FILTER=yes
 !CONFIG_TELECINE_FILTER=yes
@@ -1805,6 +1885,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_YADIF_FILTER=yes
 !CONFIG_ZMQ_FILTER=yes
 !CONFIG_ZOOMPAN_FILTER=yes
+!CONFIG_ZSCALE_FILTER=yes
 !CONFIG_ALLRGB_FILTER=yes
 !CONFIG_ALLYUV_FILTER=yes
 !CONFIG_CELLAUTO_FILTER=yes
@@ -1819,21 +1900,24 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_SMPTEBARS_FILTER=yes
 !CONFIG_SMPTEHDBARS_FILTER=yes
 !CONFIG_TESTSRC_FILTER=yes
+!CONFIG_TESTSRC2_FILTER=yes
 !CONFIG_NULLSINK_FILTER=yes
 !CONFIG_ADRAWGRAPH_FILTER=yes
+!CONFIG_AHISTOGRAM_FILTER=yes
 !CONFIG_APHASEMETER_FILTER=yes
 !CONFIG_AVECTORSCOPE_FILTER=yes
 !CONFIG_CONCAT_FILTER=yes
 !CONFIG_SHOWCQT_FILTER=yes
 !CONFIG_SHOWFREQS_FILTER=yes
 !CONFIG_SHOWSPECTRUM_FILTER=yes
+!CONFIG_SHOWSPECTRUMPIC_FILTER=yes
 !CONFIG_SHOWVOLUME_FILTER=yes
 !CONFIG_SHOWWAVES_FILTER=yes
 !CONFIG_SHOWWAVESPIC_FILTER=yes
+!CONFIG_SPECTRUMSYNTH_FILTER=yes
 !CONFIG_AMOVIE_FILTER=yes
 !CONFIG_MOVIE_FILTER=yes
 !CONFIG_H263_VAAPI_HWACCEL=yes
-!CONFIG_H263_VDPAU_HWACCEL=yes
 !CONFIG_H263_VIDEOTOOLBOX_HWACCEL=yes
 !CONFIG_H264_D3D11VA_HWACCEL=yes
 !CONFIG_H264_DXVA2_HWACCEL=yes
@@ -1855,10 +1939,12 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_MPEG2_XVMC_HWACCEL=yes
 !CONFIG_MPEG2_D3D11VA_HWACCEL=yes
 !CONFIG_MPEG2_DXVA2_HWACCEL=yes
+!CONFIG_MPEG2_MMAL_HWACCEL=yes
 !CONFIG_MPEG2_QSV_HWACCEL=yes
 !CONFIG_MPEG2_VAAPI_HWACCEL=yes
 !CONFIG_MPEG2_VDPAU_HWACCEL=yes
 !CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL=yes
+!CONFIG_MPEG4_MMAL_HWACCEL=yes
 !CONFIG_MPEG4_VAAPI_HWACCEL=yes
 !CONFIG_MPEG4_VDPAU_HWACCEL=yes
 !CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL=yes
@@ -1866,7 +1952,11 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_VC1_DXVA2_HWACCEL=yes
 !CONFIG_VC1_VAAPI_HWACCEL=yes
 !CONFIG_VC1_VDPAU_HWACCEL=yes
+!CONFIG_VC1_MMAL_HWACCEL=yes
 !CONFIG_VC1_QSV_HWACCEL=yes
+!CONFIG_VP9_D3D11VA_HWACCEL=yes
+!CONFIG_VP9_DXVA2_HWACCEL=yes
+!CONFIG_VP9_VAAPI_HWACCEL=yes
 !CONFIG_WMV3_D3D11VA_HWACCEL=yes
 !CONFIG_WMV3_DXVA2_HWACCEL=yes
 !CONFIG_WMV3_VAAPI_HWACCEL=yes
@@ -2036,6 +2126,7 @@ CONFIG_WEBVTT_MUXER=yes
 CONFIG_WTV_MUXER=yes
 CONFIG_WV_MUXER=yes
 CONFIG_YUV4MPEGPIPE_MUXER=yes
+!CONFIG_CHROMAPRINT_MUXER=yes
 !CONFIG_LIBNUT_MUXER=yes
 !CONFIG_ALSA_OUTDEV=yes
 !CONFIG_CACA_OUTDEV=yes
@@ -2059,6 +2150,7 @@ CONFIG_DCA_PARSER=yes
 CONFIG_DIRAC_PARSER=yes
 CONFIG_DNXHD_PARSER=yes
 CONFIG_DPX_PARSER=yes
+CONFIG_DVAUDIO_PARSER=yes
 CONFIG_DVBSUB_PARSER=yes
 CONFIG_DVDSUB_PARSER=yes
 CONFIG_DVD_NAV_PARSER=yes
@@ -2116,6 +2208,7 @@ CONFIG_RTP_PROTOCOL=yes
 CONFIG_SRTP_PROTOCOL=yes
 CONFIG_SUBFILE_PROTOCOL=yes
 CONFIG_TCP_PROTOCOL=yes
+!CONFIG_TLS_SCHANNEL_PROTOCOL=yes
 !CONFIG_TLS_SECURETRANSPORT_PROTOCOL=yes
 !CONFIG_TLS_GNUTLS_PROTOCOL=yes
 !CONFIG_TLS_OPENSSL_PROTOCOL=yes
diff --git a/android/config-silvermont.mak b/android/config-silvermont.mak
index 0179e9b7be..202df40c0a 100644
--- a/android/config-silvermont.mak
+++ b/android/config-silvermont.mak
@@ -12,6 +12,7 @@ DOCDIR=$(DESTDIR)${prefix}/share/doc/ffmpeg
 MANDIR=$(DESTDIR)${prefix}/share/man
 PKGCONFIGDIR=$(DESTDIR)${prefix}/lib/pkgconfig
 SRC_PATH=.
+SRC_LINK=.
 ifndef MAIN_MAKEFILE
 SRC_PATH:=$(SRC_PATH:.%=..%)
 endif
@@ -21,6 +22,7 @@ INTRINSICS=none
 CC=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android-gcc
 CXX=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android-g++
 AS=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android-gcc
+OBJCC=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android-gcc
 LD=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android-gcc
 DEPCC=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android-gcc
 DEPCCFLAGS= $(CPPFLAGS)
@@ -36,11 +38,15 @@ STRIP=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linu
 CP=cp -p
 LN_S=ln -s -f
 CPPFLAGS= --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-x86 -isysroot ../../prebuilts/ndk/current/platforms/android-21/arch-x86 -D_ISOC99_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Dstrtod=avpriv_strtod -DPIC -DZLIB_CONST
-CFLAGS=  -m32 -march=silvermont -std=c99 -fomit-frame-pointer -fPIC -pthread -Wdeclaration-after-statement -Wall -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wwrite-strings -Wtype-limits -Wundef -Wmissing-prototypes -Wno-pointer-to-int-cast -Wstrict-prototypes -Wempty-body -Wno-parentheses -Wno-switch -Wno-format-zero-length -Wno-pointer-sign -O3 -fno-math-errno -fno-signed-zeros -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
+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
 CXXFLAGS=  -D__STDC_CONSTANT_MACROS
+OBJCFLAGS=
 ASFLAGS=  -m32 -march=silvermont -fPIC
 AS_C=-c
 AS_O=-o $@
+OBJCC_C=-c
+OBJCC_E=-E -o $@
+OBJCC_O=-o $@
 CC_C=-c
 CC_E=-E -o $@
 CC_O=-o $@
@@ -53,7 +59,7 @@ DLLTOOL=
 WINDRES=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android-windres
 DEPWINDRES=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android-gcc
 DOXYGEN=doxygen
-LDFLAGS=  --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-x86 -isysroot ../../prebuilts/ndk/current/platforms/android-21/arch-x86 -Wl,--as-needed -Wl,-z,noexecstack -Wl,--warn-common -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample
+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
 LDEXEFLAGS=
 LDLIBFLAGS=
 SHFLAGS=-shared -Wl,-soname,$$(@F) -Wl,-Bsymbolic -Wl,--version-script,$(SUBDIR)lib$(NAME).ver
@@ -69,13 +75,13 @@ SLIBPREF=lib
 SLIBSUF=.so
 EXESUF=
 EXTRA_VERSION=
-CCDEP=$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< | sed -e "/^\#.*/d" -e "s,^[[:space:]]*$(*F)\\.o,$(@D)/$(*F).o," > $(@:.o=.d)
+CCDEP=
 CXXDEP=
-CCDEP_FLAGS=-MM
-ASDEP=$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< | sed -e "/^\#.*/d" -e "s,^[[:space:]]*$(*F)\\.o,$(@D)/$(*F).o," > $(@:.o=.d)
-ASDEP_FLAGS=-MM
-CC_DEPFLAGS=
-AS_DEPFLAGS=
+CCDEP_FLAGS=
+ASDEP=
+ASDEP_FLAGS=
+CC_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@
+AS_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@
 HOSTCC=gcc
 HOSTLD=gcc
 HOSTCFLAGS=  -std=c99 -Wall -O3
@@ -85,13 +91,13 @@ HOSTLDFLAGS=
 HOSTLIBS=-lm
 DEPHOSTCC=gcc
 DEPHOSTCCFLAGS= $(HOSTCCFLAGS)
-HOSTCCDEP=$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< | sed -e "/^\#.*/d" -e "s,^[[:space:]]*$(*F)\\.o,$(@D)/$(*F).o," > $(@:.o=.d)
-HOSTCCDEP_FLAGS=-MM
-HOSTCC_DEPFLAGS=
+HOSTCCDEP=
+HOSTCCDEP_FLAGS=
+HOSTCC_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@
 HOSTCC_C=-c
 HOSTCC_O=-o $@
 HOSTLD_O=-o $@
-TARGET_EXEC= 
+TARGET_EXEC=
 TARGET_PATH=$(CURDIR)
 TARGET_SAMPLES=$(SAMPLES)
 CFLAGS-ffplay=
@@ -113,33 +119,33 @@ SLIB_INSTALL_EXTRA_LIB=
 SLIB_INSTALL_EXTRA_SHLIB=
 SAMPLES:=$(FATE_SAMPLES)
 NOREDZONE_FLAGS=-mno-red-zone
-libavcodec_VERSION=56.60.100
-libavcodec_VERSION_MAJOR=56
-libavcodec_VERSION_MINOR=60
-libavdevice_VERSION=56.4.100
-libavdevice_VERSION_MAJOR=56
-libavdevice_VERSION_MINOR=4
-libavfilter_VERSION=5.40.101
-libavfilter_VERSION_MAJOR=5
-libavfilter_VERSION_MINOR=40
-libavformat_VERSION=56.40.101
-libavformat_VERSION_MAJOR=56
-libavformat_VERSION_MINOR=40
-libavresample_VERSION=2.1.0
-libavresample_VERSION_MAJOR=2
-libavresample_VERSION_MINOR=1
-libavutil_VERSION=54.31.100
-libavutil_VERSION_MAJOR=54
-libavutil_VERSION_MINOR=31
-libpostproc_VERSION=53.3.100
-libpostproc_VERSION_MAJOR=53
-libpostproc_VERSION_MINOR=3
-libswresample_VERSION=1.2.101
-libswresample_VERSION_MAJOR=1
-libswresample_VERSION_MINOR=2
-libswscale_VERSION=3.1.101
-libswscale_VERSION_MAJOR=3
-libswscale_VERSION_MINOR=1
+libavcodec_VERSION=57.24.102
+libavcodec_VERSION_MAJOR=57
+libavcodec_VERSION_MINOR=24
+libavdevice_VERSION=57.0.101
+libavdevice_VERSION_MAJOR=57
+libavdevice_VERSION_MINOR=0
+libavfilter_VERSION=6.31.100
+libavfilter_VERSION_MAJOR=6
+libavfilter_VERSION_MINOR=31
+libavformat_VERSION=57.25.100
+libavformat_VERSION_MAJOR=57
+libavformat_VERSION_MINOR=25
+libavresample_VERSION=3.0.0
+libavresample_VERSION_MAJOR=3
+libavresample_VERSION_MINOR=0
+libavutil_VERSION=55.17.103
+libavutil_VERSION_MAJOR=55
+libavutil_VERSION_MINOR=17
+libpostproc_VERSION=54.0.100
+libpostproc_VERSION_MAJOR=54
+libpostproc_VERSION_MINOR=0
+libswresample_VERSION=2.0.101
+libswresample_VERSION_MAJOR=2
+libswresample_VERSION_MINOR=0
+libswscale_VERSION=4.0.100
+libswscale_VERSION_MAJOR=4
+libswscale_VERSION_MINOR=0
 avcodec_FFLIBS=swresample avutil
 avdevice_FFLIBS=avformat avcodec swresample avutil
 avfilter_FFLIBS= avutil
@@ -191,6 +197,7 @@ ARCH_X86_32=yes
 !HAVE_POWER8=yes
 !HAVE_PPC4XX=yes
 !HAVE_VSX=yes
+HAVE_AESNI=yes
 HAVE_AMD3DNOW=yes
 HAVE_AMD3DNOWEXT=yes
 HAVE_AVX=yes
@@ -210,9 +217,10 @@ HAVE_CPUNOP=yes
 HAVE_I686=yes
 !HAVE_MIPSFPU=yes
 !HAVE_MIPS32R2=yes
-!HAVE_MIPS32R5=yes
+!HAVE_MIPS64R2=yes
+!HAVE_MIPS32R6=yes
 !HAVE_MIPS64R6=yes
-!HAVE_MIPSDSPR1=yes
+!HAVE_MIPSDSP=yes
 !HAVE_MIPSDSPR2=yes
 !HAVE_MSA=yes
 HAVE_LOONGSON2=yes
@@ -232,6 +240,7 @@ HAVE_LOONGSON3=yes
 !HAVE_POWER8_EXTERNAL=yes
 !HAVE_PPC4XX_EXTERNAL=yes
 !HAVE_VSX_EXTERNAL=yes
+HAVE_AESNI_EXTERNAL=yes
 HAVE_AMD3DNOW_EXTERNAL=yes
 HAVE_AMD3DNOWEXT_EXTERNAL=yes
 HAVE_AVX_EXTERNAL=yes
@@ -251,9 +260,10 @@ HAVE_XOP_EXTERNAL=yes
 !HAVE_I686_EXTERNAL=yes
 !HAVE_MIPSFPU_EXTERNAL=yes
 !HAVE_MIPS32R2_EXTERNAL=yes
-!HAVE_MIPS32R5_EXTERNAL=yes
+!HAVE_MIPS64R2_EXTERNAL=yes
+!HAVE_MIPS32R6_EXTERNAL=yes
 !HAVE_MIPS64R6_EXTERNAL=yes
-!HAVE_MIPSDSPR1_EXTERNAL=yes
+!HAVE_MIPSDSP_EXTERNAL=yes
 !HAVE_MIPSDSPR2_EXTERNAL=yes
 !HAVE_MSA_EXTERNAL=yes
 !HAVE_LOONGSON2_EXTERNAL=yes
@@ -273,6 +283,7 @@ HAVE_XOP_EXTERNAL=yes
 !HAVE_POWER8_INLINE=yes
 !HAVE_PPC4XX_INLINE=yes
 !HAVE_VSX_INLINE=yes
+HAVE_AESNI_INLINE=yes
 HAVE_AMD3DNOW_INLINE=yes
 HAVE_AMD3DNOWEXT_INLINE=yes
 HAVE_AVX_INLINE=yes
@@ -292,9 +303,10 @@ HAVE_XOP_INLINE=yes
 !HAVE_I686_INLINE=yes
 !HAVE_MIPSFPU_INLINE=yes
 !HAVE_MIPS32R2_INLINE=yes
-!HAVE_MIPS32R5_INLINE=yes
+!HAVE_MIPS64R2_INLINE=yes
+!HAVE_MIPS32R6_INLINE=yes
 !HAVE_MIPS64R6_INLINE=yes
-!HAVE_MIPSDSPR1_INLINE=yes
+!HAVE_MIPSDSP_INLINE=yes
 !HAVE_MIPSDSPR2_INLINE=yes
 !HAVE_MSA_INLINE=yes
 !HAVE_LOONGSON2_INLINE=yes
@@ -319,6 +331,8 @@ HAVE_MM_EMPTY=yes
 !HAVE_RDTSC=yes
 HAVE_SARESTART=yes
 HAVE_SYNC_VAL_COMPARE_AND_SWAP=yes
+!HAVE_CABS=yes
+!HAVE_CEXP=yes
 HAVE_INLINE_ASM=yes
 !HAVE_SYMVER=yes
 HAVE_YASM=yes
@@ -348,6 +362,9 @@ HAVE_DLFCN_H=yes
 !HAVE_MACHINE_IOCTL_BT848_H=yes
 !HAVE_MACHINE_IOCTL_METEOR_H=yes
 HAVE_MALLOC_H=yes
+!HAVE_OPENCV2_CORE_CORE_C_H=yes
+!HAVE_OPENJPEG_2_1_OPENJPEG_H=yes
+!HAVE_OPENJPEG_2_0_OPENJPEG_H=yes
 !HAVE_OPENJPEG_1_5_OPENJPEG_H=yes
 !HAVE_OPENGL_GL3_H=yes
 HAVE_POLL_H=yes
@@ -378,6 +395,8 @@ HAVE_ERF=yes
 HAVE_EXP2=yes
 HAVE_EXP2F=yes
 HAVE_EXPF=yes
+HAVE_HYPOT=yes
+HAVE_ISFINITE=yes
 HAVE_ISINF=yes
 HAVE_ISNAN=yes
 HAVE_LDEXPF=yes
@@ -397,6 +416,7 @@ HAVE_TRUNC=yes
 HAVE_TRUNCF=yes
 HAVE_ACCESS=yes
 !HAVE_ALIGNED_MALLOC=yes
+HAVE_ARC4RANDOM=yes
 HAVE_CLOCK_GETTIME=yes
 !HAVE_CLOSESOCKET=yes
 !HAVE_COMMANDLINETOARGVW=yes
@@ -413,7 +433,6 @@ HAVE_GETOPT=yes
 !HAVE_GETPROCESSMEMORYINFO=yes
 !HAVE_GETPROCESSTIMES=yes
 HAVE_GETRUSAGE=yes
-HAVE_GETSERVBYPORT=yes
 !HAVE_GETSYSTEMTIMEASFILETIME=yes
 HAVE_GETTIMEOFDAY=yes
 !HAVE_GLOB=yes
@@ -446,6 +465,7 @@ HAVE_STRERROR_R=yes
 HAVE_SYSCONF=yes
 !HAVE_SYSCTL=yes
 HAVE_USLEEP=yes
+!HAVE_UTGETOSTYPEFROMSTRING=yes
 !HAVE_VIRTUALALLOC=yes
 !HAVE_WGLGETPROCADDRESS=yes
 HAVE_PTHREADS=yes
@@ -457,14 +477,14 @@ HAVE_PTHREADS=yes
 !HAVE_ASM_MOD_Q=yes
 HAVE_ATTRIBUTE_MAY_ALIAS=yes
 HAVE_ATTRIBUTE_PACKED=yes
-!HAVE_EBP_AVAILABLE=yes
+HAVE_EBP_AVAILABLE=yes
 !HAVE_EBX_AVAILABLE=yes
 !HAVE_GNU_AS=yes
 !HAVE_GNU_WINDRES=yes
 !HAVE_IBM_ASM=yes
+HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS=yes
 HAVE_INLINE_ASM_LABELS=yes
 HAVE_INLINE_ASM_NONLOCAL_LABELS=yes
-HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS=yes
 HAVE_PRAGMA_DEPRECATED=yes
 HAVE_RSYNC_CONTIMEOUT=yes
 !HAVE_SYMVER_ASM_LABEL=yes
@@ -475,7 +495,6 @@ HAVE_XMM_CLOBBERS=yes
 !HAVE_CONDITION_VARIABLE_PTR=yes
 HAVE_SOCKLEN_T=yes
 HAVE_STRUCT_ADDRINFO=yes
-!HAVE_STRUCT_DCADEC_EXSS_INFO_MATRIX_ENCODING=yes
 HAVE_STRUCT_GROUP_SOURCE_REQ=yes
 HAVE_STRUCT_IP_MREQ_SOURCE=yes
 HAVE_STRUCT_IPV6_MREQ=yes
@@ -489,8 +508,8 @@ HAVE_STRUCT_SOCKADDR_STORAGE=yes
 HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE=yes
 HAVE_ATOMICS_NATIVE=yes
 !HAVE_DOS_PATHS=yes
-!HAVE_DXVA2API_COBJ=yes
 !HAVE_DXVA2_LIB=yes
+!HAVE_DXVA2API_COBJ=yes
 !HAVE_LIBC_MSVCRT=yes
 !HAVE_LIBDC1394_1=yes
 !HAVE_LIBDC1394_2=yes
@@ -504,17 +523,18 @@ HAVE_SECTION_DATA_REL_RO=yes
 HAVE_THREADS=yes
 !HAVE_VAAPI_X11=yes
 !HAVE_VDPAU_X11=yes
+!HAVE_WINRT=yes
 !HAVE_XLIB=yes
 CONFIG_BSFS=yes
 CONFIG_DECODERS=yes
-CONFIG_DEMUXERS=yes
 CONFIG_ENCODERS=yes
-!CONFIG_FILTERS=yes
 !CONFIG_HWACCELS=yes
+CONFIG_PARSERS=yes
 !CONFIG_INDEVS=yes
-CONFIG_MUXERS=yes
 !CONFIG_OUTDEVS=yes
-CONFIG_PARSERS=yes
+!CONFIG_FILTERS=yes
+CONFIG_DEMUXERS=yes
+CONFIG_MUXERS=yes
 CONFIG_PROTOCOLS=yes
 !CONFIG_DOC=yes
 !CONFIG_HTMLPAGES=yes
@@ -539,13 +559,15 @@ CONFIG_TRANSCODE_AAC_EXAMPLE=yes
 CONFIG_TRANSCODING_EXAMPLE=yes
 !CONFIG_AVISYNTH=yes
 !CONFIG_BZLIB=yes
+!CONFIG_CHROMAPRINT=yes
 !CONFIG_CRYSTALHD=yes
 !CONFIG_DECKLINK=yes
 !CONFIG_FREI0R=yes
+!CONFIG_GCRYPT=yes
+!CONFIG_GMP=yes
 !CONFIG_GNUTLS=yes
 !CONFIG_ICONV=yes
 !CONFIG_LADSPA=yes
-!CONFIG_LIBAACPLUS=yes
 !CONFIG_LIBASS=yes
 !CONFIG_LIBBLURAY=yes
 !CONFIG_LIBBS2B=yes
@@ -576,8 +598,8 @@ CONFIG_TRANSCODING_EXAMPLE=yes
 !CONFIG_LIBOPENJPEG=yes
 !CONFIG_LIBOPUS=yes
 !CONFIG_LIBPULSE=yes
-!CONFIG_LIBQUVI=yes
 !CONFIG_LIBRTMP=yes
+!CONFIG_LIBRUBBERBAND=yes
 !CONFIG_LIBSCHROEDINGER=yes
 !CONFIG_LIBSHINE=yes
 !CONFIG_LIBSMBCLIENT=yes
@@ -585,13 +607,12 @@ CONFIG_TRANSCODING_EXAMPLE=yes
 !CONFIG_LIBSOXR=yes
 !CONFIG_LIBSPEEX=yes
 !CONFIG_LIBSSH=yes
-!CONFIG_LIBSTAGEFRIGHT_H264=yes
+!CONFIG_LIBTESSERACT=yes
 !CONFIG_LIBTHEORA=yes
 !CONFIG_LIBTWOLAME=yes
 !CONFIG_LIBUTVIDEO=yes
 !CONFIG_LIBV4L2=yes
 !CONFIG_LIBVIDSTAB=yes
-!CONFIG_LIBVO_AACENC=yes
 !CONFIG_LIBVO_AMRWBENC=yes
 !CONFIG_LIBVORBIS=yes
 !CONFIG_LIBVPX=yes
@@ -605,15 +626,18 @@ CONFIG_TRANSCODING_EXAMPLE=yes
 !CONFIG_LIBXCB_SHAPE=yes
 !CONFIG_LIBXCB_XFIXES=yes
 !CONFIG_LIBXVID=yes
+!CONFIG_LIBZIMG=yes
 !CONFIG_LIBZMQ=yes
 !CONFIG_LIBZVBI=yes
 !CONFIG_LZMA=yes
 !CONFIG_MMAL=yes
+!CONFIG_NETCDF=yes
 !CONFIG_NVENC=yes
 !CONFIG_OPENAL=yes
 !CONFIG_OPENCL=yes
 !CONFIG_OPENGL=yes
 !CONFIG_OPENSSL=yes
+!CONFIG_SCHANNEL=yes
 !CONFIG_SDL=yes
 !CONFIG_SECURETRANSPORT=yes
 !CONFIG_X11GRAB=yes
@@ -681,6 +705,7 @@ CONFIG_AUDIODSP=yes
 CONFIG_BLOCKDSP=yes
 CONFIG_BSWAPDSP=yes
 CONFIG_CABAC=yes
+CONFIG_DIRAC_PARSE=yes
 CONFIG_DVPROFILE=yes
 CONFIG_EXIF=yes
 CONFIG_FAANDCT=yes
@@ -690,8 +715,6 @@ CONFIG_FLACDSP=yes
 CONFIG_FMTCONVERT=yes
 CONFIG_FRAME_THREAD_ENCODER=yes
 CONFIG_G722DSP=yes
-!CONFIG_GCRYPT=yes
-!CONFIG_GMP=yes
 CONFIG_GOLOMB=yes
 !CONFIG_GPLV3=yes
 CONFIG_H263DSP=yes
@@ -709,11 +732,12 @@ CONFIG_IMDCT15=yes
 CONFIG_INTRAX8=yes
 CONFIG_IVIDSP=yes
 CONFIG_JPEGTABLES=yes
-!CONFIG_LIBX262=yes
 !CONFIG_LGPLV3=yes
+!CONFIG_LIBX262=yes
 CONFIG_LLAUDDSP=yes
 CONFIG_LLVIDDSP=yes
 CONFIG_LPC=yes
+CONFIG_LZF=yes
 CONFIG_ME_CMP=yes
 CONFIG_MPEG_ER=yes
 CONFIG_MPEGAUDIO=yes
@@ -784,6 +808,7 @@ CONFIG_C93_DECODER=yes
 CONFIG_CAVS_DECODER=yes
 CONFIG_CDGRAPHICS_DECODER=yes
 CONFIG_CDXL_DECODER=yes
+CONFIG_CFHD_DECODER=yes
 CONFIG_CINEPAK_DECODER=yes
 CONFIG_CLJR_DECODER=yes
 CONFIG_CLLC_DECODER=yes
@@ -797,9 +822,11 @@ CONFIG_DIRAC_DECODER=yes
 CONFIG_DNXHD_DECODER=yes
 CONFIG_DPX_DECODER=yes
 CONFIG_DSICINVIDEO_DECODER=yes
+CONFIG_DVAUDIO_DECODER=yes
 CONFIG_DVVIDEO_DECODER=yes
 CONFIG_DXA_DECODER=yes
 CONFIG_DXTORY_DECODER=yes
+CONFIG_DXV_DECODER=yes
 CONFIG_EACMV_DECODER=yes
 CONFIG_EAMAD_DECODER=yes
 CONFIG_EATGQ_DECODER=yes
@@ -841,7 +868,6 @@ CONFIG_HQ_HQA_DECODER=yes
 CONFIG_HQX_DECODER=yes
 CONFIG_HUFFYUV_DECODER=yes
 CONFIG_IDCIN_DECODER=yes
-CONFIG_IFF_BYTERUN1_DECODER=yes
 CONFIG_IFF_ILBM_DECODER=yes
 CONFIG_INDEO2_DECODER=yes
 CONFIG_INDEO3_DECODER=yes
@@ -866,10 +892,12 @@ CONFIG_MPEG1VIDEO_DECODER=yes
 CONFIG_MPEG2VIDEO_DECODER=yes
 CONFIG_MPEG4_DECODER=yes
 !CONFIG_MPEG4_CRYSTALHD_DECODER=yes
+!CONFIG_MPEG4_MMAL_DECODER=yes
 !CONFIG_MPEG4_VDPAU_DECODER=yes
 CONFIG_MPEGVIDEO_DECODER=yes
 !CONFIG_MPEG_VDPAU_DECODER=yes
 !CONFIG_MPEG1_VDPAU_DECODER=yes
+!CONFIG_MPEG2_MMAL_DECODER=yes
 !CONFIG_MPEG2_CRYSTALHD_DECODER=yes
 !CONFIG_MPEG2_QSV_DECODER=yes
 CONFIG_MSA1_DECODER=yes
@@ -908,12 +936,15 @@ CONFIG_RAWVIDEO_DECODER=yes
 CONFIG_RL2_DECODER=yes
 CONFIG_ROQ_DECODER=yes
 CONFIG_RPZA_DECODER=yes
+CONFIG_RSCC_DECODER=yes
 CONFIG_RV10_DECODER=yes
 CONFIG_RV20_DECODER=yes
 CONFIG_RV30_DECODER=yes
 CONFIG_RV40_DECODER=yes
 CONFIG_S302M_DECODER=yes
 CONFIG_SANM_DECODER=yes
+CONFIG_SCREENPRESSO_DECODER=yes
+CONFIG_SDX2_DPCM_DECODER=yes
 CONFIG_SGI_DECODER=yes
 CONFIG_SGIRLE_DECODER=yes
 CONFIG_SMACKER_DECODER=yes
@@ -950,6 +981,7 @@ CONFIG_VC1_DECODER=yes
 !CONFIG_VC1_CRYSTALHD_DECODER=yes
 !CONFIG_VC1_VDPAU_DECODER=yes
 CONFIG_VC1IMAGE_DECODER=yes
+!CONFIG_VC1_MMAL_DECODER=yes
 !CONFIG_VC1_QSV_DECODER=yes
 CONFIG_VCR1_DECODER=yes
 CONFIG_VMDVIDEO_DECODER=yes
@@ -1018,6 +1050,7 @@ CONFIG_GSM_DECODER=yes
 CONFIG_GSM_MS_DECODER=yes
 CONFIG_IAC_DECODER=yes
 CONFIG_IMC_DECODER=yes
+CONFIG_INTERPLAY_ACM_DECODER=yes
 CONFIG_MACE3_DECODER=yes
 CONFIG_MACE6_DECODER=yes
 CONFIG_METASOUND_DECODER=yes
@@ -1061,6 +1094,8 @@ CONFIG_WMAV1_DECODER=yes
 CONFIG_WMAV2_DECODER=yes
 CONFIG_WMAVOICE_DECODER=yes
 CONFIG_WS_SND1_DECODER=yes
+CONFIG_XMA1_DECODER=yes
+CONFIG_XMA2_DECODER=yes
 CONFIG_PCM_ALAW_DECODER=yes
 CONFIG_PCM_BLURAY_DECODER=yes
 CONFIG_PCM_DVD_DECODER=yes
@@ -1098,6 +1133,7 @@ CONFIG_XAN_DPCM_DECODER=yes
 CONFIG_ADPCM_4XM_DECODER=yes
 CONFIG_ADPCM_ADX_DECODER=yes
 CONFIG_ADPCM_AFC_DECODER=yes
+CONFIG_ADPCM_AICA_DECODER=yes
 CONFIG_ADPCM_CT_DECODER=yes
 CONFIG_ADPCM_DTK_DECODER=yes
 CONFIG_ADPCM_EA_DECODER=yes
@@ -1123,6 +1159,7 @@ CONFIG_ADPCM_IMA_SMJPEG_DECODER=yes
 CONFIG_ADPCM_IMA_WAV_DECODER=yes
 CONFIG_ADPCM_IMA_WS_DECODER=yes
 CONFIG_ADPCM_MS_DECODER=yes
+CONFIG_ADPCM_PSX_DECODER=yes
 CONFIG_ADPCM_SBPRO_2_DECODER=yes
 CONFIG_ADPCM_SBPRO_3_DECODER=yes
 CONFIG_ADPCM_SBPRO_4_DECODER=yes
@@ -1132,7 +1169,6 @@ CONFIG_ADPCM_THP_LE_DECODER=yes
 CONFIG_ADPCM_VIMA_DECODER=yes
 CONFIG_ADPCM_XA_DECODER=yes
 CONFIG_ADPCM_YAMAHA_DECODER=yes
-CONFIG_VIMA_DECODER=yes
 CONFIG_SSA_DECODER=yes
 !CONFIG_ASS_DECODER=yes
 CONFIG_CCAPTION_DECODER=yes
@@ -1167,7 +1203,6 @@ CONFIG_XSUB_DECODER=yes
 !CONFIG_LIBOPUS_DECODER=yes
 !CONFIG_LIBSCHROEDINGER_DECODER=yes
 !CONFIG_LIBSPEEX_DECODER=yes
-!CONFIG_LIBSTAGEFRIGHT_H264_DECODER=yes
 !CONFIG_LIBUTVIDEO_DECODER=yes
 !CONFIG_LIBVORBIS_DECODER=yes
 !CONFIG_LIBVPX_VP8_DECODER=yes
@@ -1179,9 +1214,11 @@ CONFIG_IDF_DECODER=yes
 CONFIG_AA_DEMUXER=yes
 CONFIG_AAC_DEMUXER=yes
 CONFIG_AC3_DEMUXER=yes
+CONFIG_ACM_DEMUXER=yes
 CONFIG_ACT_DEMUXER=yes
 CONFIG_ADF_DEMUXER=yes
 CONFIG_ADP_DEMUXER=yes
+CONFIG_ADS_DEMUXER=yes
 CONFIG_ADX_DEMUXER=yes
 CONFIG_AEA_DEMUXER=yes
 CONFIG_AFC_DEMUXER=yes
@@ -1219,6 +1256,7 @@ CONFIG_CINE_DEMUXER=yes
 CONFIG_CONCAT_DEMUXER=yes
 CONFIG_DATA_DEMUXER=yes
 CONFIG_DAUD_DEMUXER=yes
+CONFIG_DCSTR_DEMUXER=yes
 CONFIG_DFA_DEMUXER=yes
 CONFIG_DIRAC_DEMUXER=yes
 CONFIG_DNXHD_DEMUXER=yes
@@ -1243,9 +1281,11 @@ CONFIG_FLV_DEMUXER=yes
 CONFIG_LIVE_FLV_DEMUXER=yes
 CONFIG_FOURXM_DEMUXER=yes
 CONFIG_FRM_DEMUXER=yes
+CONFIG_FSB_DEMUXER=yes
 CONFIG_G722_DEMUXER=yes
 CONFIG_G723_1_DEMUXER=yes
 CONFIG_G729_DEMUXER=yes
+CONFIG_GENH_DEMUXER=yes
 CONFIG_GIF_DEMUXER=yes
 CONFIG_GSM_DEMUXER=yes
 CONFIG_GXF_DEMUXER=yes
@@ -1270,9 +1310,9 @@ CONFIG_IRCAM_DEMUXER=yes
 CONFIG_ISS_DEMUXER=yes
 CONFIG_IV8_DEMUXER=yes
 CONFIG_IVF_DEMUXER=yes
+CONFIG_IVR_DEMUXER=yes
 !CONFIG_JACOSUB_DEMUXER=yes
 CONFIG_JV_DEMUXER=yes
-CONFIG_LATM_DEMUXER=yes
 CONFIG_LMLM4_DEMUXER=yes
 CONFIG_LOAS_DEMUXER=yes
 CONFIG_LRC_DEMUXER=yes
@@ -1298,6 +1338,7 @@ CONFIG_MPEGVIDEO_DEMUXER=yes
 CONFIG_MPJPEG_DEMUXER=yes
 !CONFIG_MPL2_DEMUXER=yes
 CONFIG_MPSUB_DEMUXER=yes
+CONFIG_MSF_DEMUXER=yes
 CONFIG_MSNWC_TCP_DEMUXER=yes
 CONFIG_MTV_DEMUXER=yes
 CONFIG_MV_DEMUXER=yes
@@ -1370,22 +1411,28 @@ CONFIG_STL_DEMUXER=yes
 !CONFIG_SUBVIEWER1_DEMUXER=yes
 !CONFIG_SUBVIEWER_DEMUXER=yes
 CONFIG_SUP_DEMUXER=yes
+CONFIG_SVAG_DEMUXER=yes
 CONFIG_SWF_DEMUXER=yes
 CONFIG_TAK_DEMUXER=yes
 CONFIG_TEDCAPTIONS_DEMUXER=yes
 CONFIG_THP_DEMUXER=yes
+CONFIG_THREEDOSTR_DEMUXER=yes
 CONFIG_TIERTEXSEQ_DEMUXER=yes
 CONFIG_TMV_DEMUXER=yes
 CONFIG_TRUEHD_DEMUXER=yes
 CONFIG_TTA_DEMUXER=yes
 CONFIG_TXD_DEMUXER=yes
 CONFIG_TTY_DEMUXER=yes
+CONFIG_V210_DEMUXER=yes
+CONFIG_V210X_DEMUXER=yes
+CONFIG_VAG_DEMUXER=yes
 CONFIG_VC1_DEMUXER=yes
 CONFIG_VC1T_DEMUXER=yes
 CONFIG_VIVO_DEMUXER=yes
 CONFIG_VMD_DEMUXER=yes
 CONFIG_VOBSUB_DEMUXER=yes
 CONFIG_VOC_DEMUXER=yes
+CONFIG_VPK_DEMUXER=yes
 !CONFIG_VPLAYER_DEMUXER=yes
 CONFIG_VQF_DEMUXER=yes
 CONFIG_W64_DEMUXER=yes
@@ -1396,10 +1443,12 @@ CONFIG_WEBVTT_DEMUXER=yes
 CONFIG_WSAUD_DEMUXER=yes
 CONFIG_WSVQA_DEMUXER=yes
 CONFIG_WTV_DEMUXER=yes
+CONFIG_WVE_DEMUXER=yes
 CONFIG_WV_DEMUXER=yes
 CONFIG_XA_DEMUXER=yes
 CONFIG_XBIN_DEMUXER=yes
 CONFIG_XMV_DEMUXER=yes
+CONFIG_XVAG_DEMUXER=yes
 CONFIG_XWMA_DEMUXER=yes
 CONFIG_YOP_DEMUXER=yes
 CONFIG_YUV4MPEGPIPE_DEMUXER=yes
@@ -1420,7 +1469,6 @@ CONFIG_IMAGE_WEBP_PIPE_DEMUXER=yes
 !CONFIG_LIBGME_DEMUXER=yes
 !CONFIG_LIBMODPLUG_DEMUXER=yes
 !CONFIG_LIBNUT_DEMUXER=yes
-!CONFIG_LIBQUVI_DEMUXER=yes
 CONFIG_A64MULTI_ENCODER=yes
 CONFIG_A64MULTI5_ENCODER=yes
 CONFIG_ALIAS_PIX_ENCODER=yes
@@ -1488,6 +1536,8 @@ CONFIG_V210_ENCODER=yes
 CONFIG_V308_ENCODER=yes
 CONFIG_V408_ENCODER=yes
 CONFIG_V410_ENCODER=yes
+CONFIG_VC2_ENCODER=yes
+CONFIG_WRAPPED_AVFRAME_ENCODER=yes
 CONFIG_WMV1_ENCODER=yes
 CONFIG_WMV2_ENCODER=yes
 CONFIG_XBM_ENCODER=yes
@@ -1558,6 +1608,7 @@ CONFIG_DVDSUB_ENCODER=yes
 CONFIG_MOVTEXT_ENCODER=yes
 CONFIG_SRT_ENCODER=yes
 CONFIG_SUBRIP_ENCODER=yes
+CONFIG_TEXT_ENCODER=yes
 CONFIG_WEBVTT_ENCODER=yes
 CONFIG_XSUB_ENCODER=yes
 !CONFIG_LIBFAAC_ENCODER=yes
@@ -1575,7 +1626,6 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_LIBTHEORA_ENCODER=yes
 !CONFIG_LIBTWOLAME_ENCODER=yes
 !CONFIG_LIBUTVIDEO_ENCODER=yes
-!CONFIG_LIBVO_AACENC_ENCODER=yes
 !CONFIG_LIBVO_AMRWBENC_ENCODER=yes
 !CONFIG_LIBVORBIS_ENCODER=yes
 !CONFIG_LIBVPX_VP8_ENCODER=yes
@@ -1589,7 +1639,6 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_LIBX265_ENCODER=yes
 !CONFIG_LIBXAVS_ENCODER=yes
 !CONFIG_LIBXVID_ENCODER=yes
-!CONFIG_LIBAACPLUS_ENCODER=yes
 !CONFIG_LIBOPENH264_ENCODER=yes
 !CONFIG_H264_QSV_ENCODER=yes
 !CONFIG_NVENC_ENCODER=yes
@@ -1598,20 +1647,29 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_HEVC_QSV_ENCODER=yes
 !CONFIG_LIBKVAZAAR_ENCODER=yes
 !CONFIG_MPEG2_QSV_ENCODER=yes
+!CONFIG_ACOMPRESSOR_FILTER=yes
 !CONFIG_ACROSSFADE_FILTER=yes
 !CONFIG_ADELAY_FILTER=yes
 !CONFIG_AECHO_FILTER=yes
+!CONFIG_AEMPHASIS_FILTER=yes
 !CONFIG_AEVAL_FILTER=yes
 !CONFIG_AFADE_FILTER=yes
+!CONFIG_AFFTFILT_FILTER=yes
 !CONFIG_AFORMAT_FILTER=yes
+!CONFIG_AGATE_FILTER=yes
 !CONFIG_AINTERLEAVE_FILTER=yes
+!CONFIG_ALIMITER_FILTER=yes
 !CONFIG_ALLPASS_FILTER=yes
 !CONFIG_AMERGE_FILTER=yes
+!CONFIG_AMETADATA_FILTER=yes
 !CONFIG_AMIX_FILTER=yes
+!CONFIG_ANEQUALIZER_FILTER=yes
 !CONFIG_ANULL_FILTER=yes
 !CONFIG_APAD_FILTER=yes
 !CONFIG_APERMS_FILTER=yes
 !CONFIG_APHASER_FILTER=yes
+!CONFIG_APULSATOR_FILTER=yes
+!CONFIG_AREALTIME_FILTER=yes
 !CONFIG_ARESAMPLE_FILTER=yes
 !CONFIG_AREVERSE_FILTER=yes
 !CONFIG_ASELECT_FILTER=yes
@@ -1623,7 +1681,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_ASHOWINFO_FILTER=yes
 !CONFIG_ASPLIT_FILTER=yes
 !CONFIG_ASTATS_FILTER=yes
-!CONFIG_ASTREAMSYNC_FILTER=yes
+!CONFIG_ASTREAMSELECT_FILTER=yes
 !CONFIG_ASYNCTS_FILTER=yes
 !CONFIG_ATEMPO_FILTER=yes
 !CONFIG_ATRIM_FILTER=yes
@@ -1637,11 +1695,13 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_CHANNELSPLIT_FILTER=yes
 !CONFIG_CHORUS_FILTER=yes
 !CONFIG_COMPAND_FILTER=yes
+!CONFIG_COMPENSATIONDELAY_FILTER=yes
 !CONFIG_DCSHIFT_FILTER=yes
 !CONFIG_DYNAUDNORM_FILTER=yes
 !CONFIG_EARWAX_FILTER=yes
 !CONFIG_EBUR128_FILTER=yes
 !CONFIG_EQUALIZER_FILTER=yes
+!CONFIG_EXTRASTEREO_FILTER=yes
 !CONFIG_FLANGER_FILTER=yes
 !CONFIG_HIGHPASS_FILTER=yes
 !CONFIG_JOIN_FILTER=yes
@@ -1650,13 +1710,21 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_PAN_FILTER=yes
 !CONFIG_REPLAYGAIN_FILTER=yes
 !CONFIG_RESAMPLE_FILTER=yes
+!CONFIG_RUBBERBAND_FILTER=yes
 !CONFIG_SIDECHAINCOMPRESS_FILTER=yes
+!CONFIG_SIDECHAINGATE_FILTER=yes
 !CONFIG_SILENCEDETECT_FILTER=yes
 !CONFIG_SILENCEREMOVE_FILTER=yes
+!CONFIG_SOFALIZER_FILTER=yes
+!CONFIG_STEREOTOOLS_FILTER=yes
+!CONFIG_STEREOWIDEN_FILTER=yes
 !CONFIG_TREBLE_FILTER=yes
+!CONFIG_TREMOLO_FILTER=yes
+!CONFIG_VIBRATO_FILTER=yes
 !CONFIG_VOLUME_FILTER=yes
 !CONFIG_VOLUMEDETECT_FILTER=yes
 !CONFIG_AEVALSRC_FILTER=yes
+!CONFIG_ANOISESRC_FILTER=yes
 !CONFIG_ANULLSRC_FILTER=yes
 !CONFIG_FLITE_FILTER=yes
 !CONFIG_SINE_FILTER=yes
@@ -1670,12 +1738,14 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_BLACKFRAME_FILTER=yes
 !CONFIG_BLEND_FILTER=yes
 !CONFIG_BOXBLUR_FILTER=yes
+!CONFIG_CHROMAKEY_FILTER=yes
 !CONFIG_CODECVIEW_FILTER=yes
 !CONFIG_COLORBALANCE_FILTER=yes
 !CONFIG_COLORCHANNELMIXER_FILTER=yes
 !CONFIG_COLORKEY_FILTER=yes
 !CONFIG_COLORLEVELS_FILTER=yes
 !CONFIG_COLORMATRIX_FILTER=yes
+!CONFIG_CONVOLUTION_FILTER=yes
 !CONFIG_COPY_FILTER=yes
 !CONFIG_COVER_RECT_FILTER=yes
 !CONFIG_CROP_FILTER=yes
@@ -1690,6 +1760,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_DESHAKE_FILTER=yes
 !CONFIG_DETELECINE_FILTER=yes
 !CONFIG_DILATION_FILTER=yes
+!CONFIG_DISPLACE_FILTER=yes
 !CONFIG_DRAWBOX_FILTER=yes
 !CONFIG_DRAWGRAPH_FILTER=yes
 !CONFIG_DRAWGRID_FILTER=yes
@@ -1733,13 +1804,17 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_LUT_FILTER=yes
 !CONFIG_LUTRGB_FILTER=yes
 !CONFIG_LUTYUV_FILTER=yes
+!CONFIG_MASKEDMERGE_FILTER=yes
 !CONFIG_MCDEINT_FILTER=yes
 !CONFIG_MERGEPLANES_FILTER=yes
+!CONFIG_METADATA_FILTER=yes
 !CONFIG_MPDECIMATE_FILTER=yes
 !CONFIG_NEGATE_FILTER=yes
+!CONFIG_NNEDI_FILTER=yes
 !CONFIG_NOFORMAT_FILTER=yes
 !CONFIG_NOISE_FILTER=yes
 !CONFIG_NULL_FILTER=yes
+!CONFIG_OCR_FILTER=yes
 !CONFIG_OCV_FILTER=yes
 !CONFIG_OVERLAY_FILTER=yes
 !CONFIG_OWDENOISE_FILTER=yes
@@ -1756,6 +1831,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_PULLUP_FILTER=yes
 !CONFIG_QP_FILTER=yes
 !CONFIG_RANDOM_FILTER=yes
+!CONFIG_REALTIME_FILTER=yes
 !CONFIG_REMOVEGRAIN_FILTER=yes
 !CONFIG_REMOVELOGO_FILTER=yes
 !CONFIG_REPEATFIELDS_FILTER=yes
@@ -1765,6 +1841,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_SCALE_FILTER=yes
 !CONFIG_SCALE2REF_FILTER=yes
 !CONFIG_SELECT_FILTER=yes
+!CONFIG_SELECTIVECOLOR_FILTER=yes
 !CONFIG_SENDCMD_FILTER=yes
 !CONFIG_SEPARATEFIELDS_FILTER=yes
 !CONFIG_SETDAR_FILTER=yes
@@ -1774,6 +1851,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_SETTB_FILTER=yes
 !CONFIG_SHOWINFO_FILTER=yes
 !CONFIG_SHOWPALETTE_FILTER=yes
+!CONFIG_SHUFFLEFRAMES_FILTER=yes
 !CONFIG_SHUFFLEPLANES_FILTER=yes
 !CONFIG_SIGNALSTATS_FILTER=yes
 !CONFIG_SMARTBLUR_FILTER=yes
@@ -1781,8 +1859,10 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_SPP_FILTER=yes
 !CONFIG_SSIM_FILTER=yes
 !CONFIG_STEREO3D_FILTER=yes
+!CONFIG_STREAMSELECT_FILTER=yes
 !CONFIG_SUBTITLES_FILTER=yes
 !CONFIG_SUPER2XSAI_FILTER=yes
+!CONFIG_SWAPRECT_FILTER=yes
 !CONFIG_SWAPUV_FILTER=yes
 !CONFIG_TBLEND_FILTER=yes
 !CONFIG_TELECINE_FILTER=yes
@@ -1805,6 +1885,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_YADIF_FILTER=yes
 !CONFIG_ZMQ_FILTER=yes
 !CONFIG_ZOOMPAN_FILTER=yes
+!CONFIG_ZSCALE_FILTER=yes
 !CONFIG_ALLRGB_FILTER=yes
 !CONFIG_ALLYUV_FILTER=yes
 !CONFIG_CELLAUTO_FILTER=yes
@@ -1819,21 +1900,24 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_SMPTEBARS_FILTER=yes
 !CONFIG_SMPTEHDBARS_FILTER=yes
 !CONFIG_TESTSRC_FILTER=yes
+!CONFIG_TESTSRC2_FILTER=yes
 !CONFIG_NULLSINK_FILTER=yes
 !CONFIG_ADRAWGRAPH_FILTER=yes
+!CONFIG_AHISTOGRAM_FILTER=yes
 !CONFIG_APHASEMETER_FILTER=yes
 !CONFIG_AVECTORSCOPE_FILTER=yes
 !CONFIG_CONCAT_FILTER=yes
 !CONFIG_SHOWCQT_FILTER=yes
 !CONFIG_SHOWFREQS_FILTER=yes
 !CONFIG_SHOWSPECTRUM_FILTER=yes
+!CONFIG_SHOWSPECTRUMPIC_FILTER=yes
 !CONFIG_SHOWVOLUME_FILTER=yes
 !CONFIG_SHOWWAVES_FILTER=yes
 !CONFIG_SHOWWAVESPIC_FILTER=yes
+!CONFIG_SPECTRUMSYNTH_FILTER=yes
 !CONFIG_AMOVIE_FILTER=yes
 !CONFIG_MOVIE_FILTER=yes
 !CONFIG_H263_VAAPI_HWACCEL=yes
-!CONFIG_H263_VDPAU_HWACCEL=yes
 !CONFIG_H263_VIDEOTOOLBOX_HWACCEL=yes
 !CONFIG_H264_D3D11VA_HWACCEL=yes
 !CONFIG_H264_DXVA2_HWACCEL=yes
@@ -1855,10 +1939,12 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_MPEG2_XVMC_HWACCEL=yes
 !CONFIG_MPEG2_D3D11VA_HWACCEL=yes
 !CONFIG_MPEG2_DXVA2_HWACCEL=yes
+!CONFIG_MPEG2_MMAL_HWACCEL=yes
 !CONFIG_MPEG2_QSV_HWACCEL=yes
 !CONFIG_MPEG2_VAAPI_HWACCEL=yes
 !CONFIG_MPEG2_VDPAU_HWACCEL=yes
 !CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL=yes
+!CONFIG_MPEG4_MMAL_HWACCEL=yes
 !CONFIG_MPEG4_VAAPI_HWACCEL=yes
 !CONFIG_MPEG4_VDPAU_HWACCEL=yes
 !CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL=yes
@@ -1866,7 +1952,11 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_VC1_DXVA2_HWACCEL=yes
 !CONFIG_VC1_VAAPI_HWACCEL=yes
 !CONFIG_VC1_VDPAU_HWACCEL=yes
+!CONFIG_VC1_MMAL_HWACCEL=yes
 !CONFIG_VC1_QSV_HWACCEL=yes
+!CONFIG_VP9_D3D11VA_HWACCEL=yes
+!CONFIG_VP9_DXVA2_HWACCEL=yes
+!CONFIG_VP9_VAAPI_HWACCEL=yes
 !CONFIG_WMV3_D3D11VA_HWACCEL=yes
 !CONFIG_WMV3_DXVA2_HWACCEL=yes
 !CONFIG_WMV3_VAAPI_HWACCEL=yes
@@ -2036,6 +2126,7 @@ CONFIG_WEBVTT_MUXER=yes
 CONFIG_WTV_MUXER=yes
 CONFIG_WV_MUXER=yes
 CONFIG_YUV4MPEGPIPE_MUXER=yes
+!CONFIG_CHROMAPRINT_MUXER=yes
 !CONFIG_LIBNUT_MUXER=yes
 !CONFIG_ALSA_OUTDEV=yes
 !CONFIG_CACA_OUTDEV=yes
@@ -2059,6 +2150,7 @@ CONFIG_DCA_PARSER=yes
 CONFIG_DIRAC_PARSER=yes
 CONFIG_DNXHD_PARSER=yes
 CONFIG_DPX_PARSER=yes
+CONFIG_DVAUDIO_PARSER=yes
 CONFIG_DVBSUB_PARSER=yes
 CONFIG_DVDSUB_PARSER=yes
 CONFIG_DVD_NAV_PARSER=yes
@@ -2116,6 +2208,7 @@ CONFIG_RTP_PROTOCOL=yes
 CONFIG_SRTP_PROTOCOL=yes
 CONFIG_SUBFILE_PROTOCOL=yes
 CONFIG_TCP_PROTOCOL=yes
+!CONFIG_TLS_SCHANNEL_PROTOCOL=yes
 !CONFIG_TLS_SECURETRANSPORT_PROTOCOL=yes
 !CONFIG_TLS_GNUTLS_PROTOCOL=yes
 !CONFIG_TLS_OPENSSL_PROTOCOL=yes
diff --git a/android/config-x86.mak b/android/config-x86.mak
index 918182f40d..0ec024e693 100644
--- a/android/config-x86.mak
+++ b/android/config-x86.mak
@@ -12,6 +12,7 @@ DOCDIR=$(DESTDIR)${prefix}/share/doc/ffmpeg
 MANDIR=$(DESTDIR)${prefix}/share/man
 PKGCONFIGDIR=$(DESTDIR)${prefix}/lib/pkgconfig
 SRC_PATH=.
+SRC_LINK=.
 ifndef MAIN_MAKEFILE
 SRC_PATH:=$(SRC_PATH:.%=..%)
 endif
@@ -21,6 +22,7 @@ INTRINSICS=none
 CC=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android-gcc
 CXX=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android-g++
 AS=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android-gcc
+OBJCC=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android-gcc
 LD=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android-gcc
 DEPCC=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android-gcc
 DEPCCFLAGS= $(CPPFLAGS)
@@ -36,11 +38,15 @@ STRIP=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linu
 CP=cp -p
 LN_S=ln -s -f
 CPPFLAGS= --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-x86 -isysroot ../../prebuilts/ndk/current/platforms/android-21/arch-x86 -D_ISOC99_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Dstrtod=avpriv_strtod -DPIC -DZLIB_CONST
-CFLAGS=  -m32 -march=i686 -std=c99 -fomit-frame-pointer -fPIC -pthread -Wdeclaration-after-statement -Wall -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wwrite-strings -Wtype-limits -Wundef -Wmissing-prototypes -Wno-pointer-to-int-cast -Wstrict-prototypes -Wempty-body -Wno-parentheses -Wno-switch -Wno-format-zero-length -Wno-pointer-sign -O3 -fno-math-errno -fno-signed-zeros -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
+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
 CXXFLAGS=  -D__STDC_CONSTANT_MACROS
+OBJCFLAGS=
 ASFLAGS=  -m32 -march=i686 -fPIC
 AS_C=-c
 AS_O=-o $@
+OBJCC_C=-c
+OBJCC_E=-E -o $@
+OBJCC_O=-o $@
 CC_C=-c
 CC_E=-E -o $@
 CC_O=-o $@
@@ -53,7 +59,7 @@ DLLTOOL=
 WINDRES=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android-windres
 DEPWINDRES=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android-gcc
 DOXYGEN=doxygen
-LDFLAGS=  --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-x86 -isysroot ../../prebuilts/ndk/current/platforms/android-21/arch-x86 -Wl,--as-needed -Wl,-z,noexecstack -Wl,--warn-common -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample
+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
 LDEXEFLAGS=
 LDLIBFLAGS=
 SHFLAGS=-shared -Wl,-soname,$$(@F) -Wl,-Bsymbolic -Wl,--version-script,$(SUBDIR)lib$(NAME).ver
@@ -69,13 +75,13 @@ SLIBPREF=lib
 SLIBSUF=.so
 EXESUF=
 EXTRA_VERSION=
-CCDEP=$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< | sed -e "/^\#.*/d" -e "s,^[[:space:]]*$(*F)\\.o,$(@D)/$(*F).o," > $(@:.o=.d)
+CCDEP=
 CXXDEP=
-CCDEP_FLAGS=-MM
-ASDEP=$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< | sed -e "/^\#.*/d" -e "s,^[[:space:]]*$(*F)\\.o,$(@D)/$(*F).o," > $(@:.o=.d)
-ASDEP_FLAGS=-MM
-CC_DEPFLAGS=
-AS_DEPFLAGS=
+CCDEP_FLAGS=
+ASDEP=
+ASDEP_FLAGS=
+CC_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@
+AS_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@
 HOSTCC=gcc
 HOSTLD=gcc
 HOSTCFLAGS=  -std=c99 -Wall -O3
@@ -85,13 +91,13 @@ HOSTLDFLAGS=
 HOSTLIBS=-lm
 DEPHOSTCC=gcc
 DEPHOSTCCFLAGS= $(HOSTCCFLAGS)
-HOSTCCDEP=$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< | sed -e "/^\#.*/d" -e "s,^[[:space:]]*$(*F)\\.o,$(@D)/$(*F).o," > $(@:.o=.d)
-HOSTCCDEP_FLAGS=-MM
-HOSTCC_DEPFLAGS=
+HOSTCCDEP=
+HOSTCCDEP_FLAGS=
+HOSTCC_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@
 HOSTCC_C=-c
 HOSTCC_O=-o $@
 HOSTLD_O=-o $@
-TARGET_EXEC= 
+TARGET_EXEC=
 TARGET_PATH=$(CURDIR)
 TARGET_SAMPLES=$(SAMPLES)
 CFLAGS-ffplay=
@@ -113,33 +119,33 @@ SLIB_INSTALL_EXTRA_LIB=
 SLIB_INSTALL_EXTRA_SHLIB=
 SAMPLES:=$(FATE_SAMPLES)
 NOREDZONE_FLAGS=-mno-red-zone
-libavcodec_VERSION=56.60.100
-libavcodec_VERSION_MAJOR=56
-libavcodec_VERSION_MINOR=60
-libavdevice_VERSION=56.4.100
-libavdevice_VERSION_MAJOR=56
-libavdevice_VERSION_MINOR=4
-libavfilter_VERSION=5.40.101
-libavfilter_VERSION_MAJOR=5
-libavfilter_VERSION_MINOR=40
-libavformat_VERSION=56.40.101
-libavformat_VERSION_MAJOR=56
-libavformat_VERSION_MINOR=40
-libavresample_VERSION=2.1.0
-libavresample_VERSION_MAJOR=2
-libavresample_VERSION_MINOR=1
-libavutil_VERSION=54.31.100
-libavutil_VERSION_MAJOR=54
-libavutil_VERSION_MINOR=31
-libpostproc_VERSION=53.3.100
-libpostproc_VERSION_MAJOR=53
-libpostproc_VERSION_MINOR=3
-libswresample_VERSION=1.2.101
-libswresample_VERSION_MAJOR=1
-libswresample_VERSION_MINOR=2
-libswscale_VERSION=3.1.101
-libswscale_VERSION_MAJOR=3
-libswscale_VERSION_MINOR=1
+libavcodec_VERSION=57.24.102
+libavcodec_VERSION_MAJOR=57
+libavcodec_VERSION_MINOR=24
+libavdevice_VERSION=57.0.101
+libavdevice_VERSION_MAJOR=57
+libavdevice_VERSION_MINOR=0
+libavfilter_VERSION=6.31.100
+libavfilter_VERSION_MAJOR=6
+libavfilter_VERSION_MINOR=31
+libavformat_VERSION=57.25.100
+libavformat_VERSION_MAJOR=57
+libavformat_VERSION_MINOR=25
+libavresample_VERSION=3.0.0
+libavresample_VERSION_MAJOR=3
+libavresample_VERSION_MINOR=0
+libavutil_VERSION=55.17.103
+libavutil_VERSION_MAJOR=55
+libavutil_VERSION_MINOR=17
+libpostproc_VERSION=54.0.100
+libpostproc_VERSION_MAJOR=54
+libpostproc_VERSION_MINOR=0
+libswresample_VERSION=2.0.101
+libswresample_VERSION_MAJOR=2
+libswresample_VERSION_MINOR=0
+libswscale_VERSION=4.0.100
+libswscale_VERSION_MAJOR=4
+libswscale_VERSION_MINOR=0
 avcodec_FFLIBS=swresample avutil
 avdevice_FFLIBS=avformat avcodec swresample avutil
 avfilter_FFLIBS= avutil
@@ -191,6 +197,7 @@ ARCH_X86_32=yes
 !HAVE_POWER8=yes
 !HAVE_PPC4XX=yes
 !HAVE_VSX=yes
+HAVE_AESNI=yes
 HAVE_AMD3DNOW=yes
 HAVE_AMD3DNOWEXT=yes
 HAVE_AVX=yes
@@ -210,9 +217,10 @@ HAVE_CPUNOP=yes
 HAVE_I686=yes
 !HAVE_MIPSFPU=yes
 !HAVE_MIPS32R2=yes
-!HAVE_MIPS32R5=yes
+!HAVE_MIPS64R2=yes
+!HAVE_MIPS32R6=yes
 !HAVE_MIPS64R6=yes
-!HAVE_MIPSDSPR1=yes
+!HAVE_MIPSDSP=yes
 !HAVE_MIPSDSPR2=yes
 !HAVE_MSA=yes
 HAVE_LOONGSON2=yes
@@ -232,6 +240,7 @@ HAVE_LOONGSON3=yes
 !HAVE_POWER8_EXTERNAL=yes
 !HAVE_PPC4XX_EXTERNAL=yes
 !HAVE_VSX_EXTERNAL=yes
+HAVE_AESNI_EXTERNAL=yes
 HAVE_AMD3DNOW_EXTERNAL=yes
 HAVE_AMD3DNOWEXT_EXTERNAL=yes
 HAVE_AVX_EXTERNAL=yes
@@ -251,9 +260,10 @@ HAVE_XOP_EXTERNAL=yes
 !HAVE_I686_EXTERNAL=yes
 !HAVE_MIPSFPU_EXTERNAL=yes
 !HAVE_MIPS32R2_EXTERNAL=yes
-!HAVE_MIPS32R5_EXTERNAL=yes
+!HAVE_MIPS64R2_EXTERNAL=yes
+!HAVE_MIPS32R6_EXTERNAL=yes
 !HAVE_MIPS64R6_EXTERNAL=yes
-!HAVE_MIPSDSPR1_EXTERNAL=yes
+!HAVE_MIPSDSP_EXTERNAL=yes
 !HAVE_MIPSDSPR2_EXTERNAL=yes
 !HAVE_MSA_EXTERNAL=yes
 !HAVE_LOONGSON2_EXTERNAL=yes
@@ -273,6 +283,7 @@ HAVE_XOP_EXTERNAL=yes
 !HAVE_POWER8_INLINE=yes
 !HAVE_PPC4XX_INLINE=yes
 !HAVE_VSX_INLINE=yes
+HAVE_AESNI_INLINE=yes
 HAVE_AMD3DNOW_INLINE=yes
 HAVE_AMD3DNOWEXT_INLINE=yes
 HAVE_AVX_INLINE=yes
@@ -292,9 +303,10 @@ HAVE_XOP_INLINE=yes
 !HAVE_I686_INLINE=yes
 !HAVE_MIPSFPU_INLINE=yes
 !HAVE_MIPS32R2_INLINE=yes
-!HAVE_MIPS32R5_INLINE=yes
+!HAVE_MIPS64R2_INLINE=yes
+!HAVE_MIPS32R6_INLINE=yes
 !HAVE_MIPS64R6_INLINE=yes
-!HAVE_MIPSDSPR1_INLINE=yes
+!HAVE_MIPSDSP_INLINE=yes
 !HAVE_MIPSDSPR2_INLINE=yes
 !HAVE_MSA_INLINE=yes
 !HAVE_LOONGSON2_INLINE=yes
@@ -319,6 +331,8 @@ HAVE_MM_EMPTY=yes
 !HAVE_RDTSC=yes
 HAVE_SARESTART=yes
 HAVE_SYNC_VAL_COMPARE_AND_SWAP=yes
+!HAVE_CABS=yes
+!HAVE_CEXP=yes
 HAVE_INLINE_ASM=yes
 !HAVE_SYMVER=yes
 HAVE_YASM=yes
@@ -348,6 +362,9 @@ HAVE_DLFCN_H=yes
 !HAVE_MACHINE_IOCTL_BT848_H=yes
 !HAVE_MACHINE_IOCTL_METEOR_H=yes
 HAVE_MALLOC_H=yes
+!HAVE_OPENCV2_CORE_CORE_C_H=yes
+!HAVE_OPENJPEG_2_1_OPENJPEG_H=yes
+!HAVE_OPENJPEG_2_0_OPENJPEG_H=yes
 !HAVE_OPENJPEG_1_5_OPENJPEG_H=yes
 !HAVE_OPENGL_GL3_H=yes
 HAVE_POLL_H=yes
@@ -378,6 +395,8 @@ HAVE_ERF=yes
 HAVE_EXP2=yes
 HAVE_EXP2F=yes
 HAVE_EXPF=yes
+HAVE_HYPOT=yes
+HAVE_ISFINITE=yes
 HAVE_ISINF=yes
 HAVE_ISNAN=yes
 HAVE_LDEXPF=yes
@@ -397,6 +416,7 @@ HAVE_TRUNC=yes
 HAVE_TRUNCF=yes
 HAVE_ACCESS=yes
 !HAVE_ALIGNED_MALLOC=yes
+HAVE_ARC4RANDOM=yes
 HAVE_CLOCK_GETTIME=yes
 !HAVE_CLOSESOCKET=yes
 !HAVE_COMMANDLINETOARGVW=yes
@@ -413,7 +433,6 @@ HAVE_GETOPT=yes
 !HAVE_GETPROCESSMEMORYINFO=yes
 !HAVE_GETPROCESSTIMES=yes
 HAVE_GETRUSAGE=yes
-HAVE_GETSERVBYPORT=yes
 !HAVE_GETSYSTEMTIMEASFILETIME=yes
 HAVE_GETTIMEOFDAY=yes
 !HAVE_GLOB=yes
@@ -446,6 +465,7 @@ HAVE_STRERROR_R=yes
 HAVE_SYSCONF=yes
 !HAVE_SYSCTL=yes
 HAVE_USLEEP=yes
+!HAVE_UTGETOSTYPEFROMSTRING=yes
 !HAVE_VIRTUALALLOC=yes
 !HAVE_WGLGETPROCADDRESS=yes
 HAVE_PTHREADS=yes
@@ -462,9 +482,9 @@ HAVE_EBP_AVAILABLE=yes
 !HAVE_GNU_AS=yes
 !HAVE_GNU_WINDRES=yes
 !HAVE_IBM_ASM=yes
+HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS=yes
 HAVE_INLINE_ASM_LABELS=yes
 HAVE_INLINE_ASM_NONLOCAL_LABELS=yes
-HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS=yes
 HAVE_PRAGMA_DEPRECATED=yes
 HAVE_RSYNC_CONTIMEOUT=yes
 !HAVE_SYMVER_ASM_LABEL=yes
@@ -475,7 +495,6 @@ HAVE_XMM_CLOBBERS=yes
 !HAVE_CONDITION_VARIABLE_PTR=yes
 HAVE_SOCKLEN_T=yes
 HAVE_STRUCT_ADDRINFO=yes
-!HAVE_STRUCT_DCADEC_EXSS_INFO_MATRIX_ENCODING=yes
 HAVE_STRUCT_GROUP_SOURCE_REQ=yes
 HAVE_STRUCT_IP_MREQ_SOURCE=yes
 HAVE_STRUCT_IPV6_MREQ=yes
@@ -489,8 +508,8 @@ HAVE_STRUCT_SOCKADDR_STORAGE=yes
 HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE=yes
 HAVE_ATOMICS_NATIVE=yes
 !HAVE_DOS_PATHS=yes
-!HAVE_DXVA2API_COBJ=yes
 !HAVE_DXVA2_LIB=yes
+!HAVE_DXVA2API_COBJ=yes
 !HAVE_LIBC_MSVCRT=yes
 !HAVE_LIBDC1394_1=yes
 !HAVE_LIBDC1394_2=yes
@@ -504,17 +523,18 @@ HAVE_SECTION_DATA_REL_RO=yes
 HAVE_THREADS=yes
 !HAVE_VAAPI_X11=yes
 !HAVE_VDPAU_X11=yes
+!HAVE_WINRT=yes
 !HAVE_XLIB=yes
 CONFIG_BSFS=yes
 CONFIG_DECODERS=yes
-CONFIG_DEMUXERS=yes
 CONFIG_ENCODERS=yes
-!CONFIG_FILTERS=yes
 !CONFIG_HWACCELS=yes
+CONFIG_PARSERS=yes
 !CONFIG_INDEVS=yes
-CONFIG_MUXERS=yes
 !CONFIG_OUTDEVS=yes
-CONFIG_PARSERS=yes
+!CONFIG_FILTERS=yes
+CONFIG_DEMUXERS=yes
+CONFIG_MUXERS=yes
 CONFIG_PROTOCOLS=yes
 !CONFIG_DOC=yes
 !CONFIG_HTMLPAGES=yes
@@ -539,13 +559,15 @@ CONFIG_TRANSCODE_AAC_EXAMPLE=yes
 CONFIG_TRANSCODING_EXAMPLE=yes
 !CONFIG_AVISYNTH=yes
 !CONFIG_BZLIB=yes
+!CONFIG_CHROMAPRINT=yes
 !CONFIG_CRYSTALHD=yes
 !CONFIG_DECKLINK=yes
 !CONFIG_FREI0R=yes
+!CONFIG_GCRYPT=yes
+!CONFIG_GMP=yes
 !CONFIG_GNUTLS=yes
 !CONFIG_ICONV=yes
 !CONFIG_LADSPA=yes
-!CONFIG_LIBAACPLUS=yes
 !CONFIG_LIBASS=yes
 !CONFIG_LIBBLURAY=yes
 !CONFIG_LIBBS2B=yes
@@ -576,8 +598,8 @@ CONFIG_TRANSCODING_EXAMPLE=yes
 !CONFIG_LIBOPENJPEG=yes
 !CONFIG_LIBOPUS=yes
 !CONFIG_LIBPULSE=yes
-!CONFIG_LIBQUVI=yes
 !CONFIG_LIBRTMP=yes
+!CONFIG_LIBRUBBERBAND=yes
 !CONFIG_LIBSCHROEDINGER=yes
 !CONFIG_LIBSHINE=yes
 !CONFIG_LIBSMBCLIENT=yes
@@ -585,13 +607,12 @@ CONFIG_TRANSCODING_EXAMPLE=yes
 !CONFIG_LIBSOXR=yes
 !CONFIG_LIBSPEEX=yes
 !CONFIG_LIBSSH=yes
-!CONFIG_LIBSTAGEFRIGHT_H264=yes
+!CONFIG_LIBTESSERACT=yes
 !CONFIG_LIBTHEORA=yes
 !CONFIG_LIBTWOLAME=yes
 !CONFIG_LIBUTVIDEO=yes
 !CONFIG_LIBV4L2=yes
 !CONFIG_LIBVIDSTAB=yes
-!CONFIG_LIBVO_AACENC=yes
 !CONFIG_LIBVO_AMRWBENC=yes
 !CONFIG_LIBVORBIS=yes
 !CONFIG_LIBVPX=yes
@@ -605,15 +626,18 @@ CONFIG_TRANSCODING_EXAMPLE=yes
 !CONFIG_LIBXCB_SHAPE=yes
 !CONFIG_LIBXCB_XFIXES=yes
 !CONFIG_LIBXVID=yes
+!CONFIG_LIBZIMG=yes
 !CONFIG_LIBZMQ=yes
 !CONFIG_LIBZVBI=yes
 !CONFIG_LZMA=yes
 !CONFIG_MMAL=yes
+!CONFIG_NETCDF=yes
 !CONFIG_NVENC=yes
 !CONFIG_OPENAL=yes
 !CONFIG_OPENCL=yes
 !CONFIG_OPENGL=yes
 !CONFIG_OPENSSL=yes
+!CONFIG_SCHANNEL=yes
 !CONFIG_SDL=yes
 !CONFIG_SECURETRANSPORT=yes
 !CONFIG_X11GRAB=yes
@@ -681,6 +705,7 @@ CONFIG_AUDIODSP=yes
 CONFIG_BLOCKDSP=yes
 CONFIG_BSWAPDSP=yes
 CONFIG_CABAC=yes
+CONFIG_DIRAC_PARSE=yes
 CONFIG_DVPROFILE=yes
 CONFIG_EXIF=yes
 CONFIG_FAANDCT=yes
@@ -690,8 +715,6 @@ CONFIG_FLACDSP=yes
 CONFIG_FMTCONVERT=yes
 CONFIG_FRAME_THREAD_ENCODER=yes
 CONFIG_G722DSP=yes
-!CONFIG_GCRYPT=yes
-!CONFIG_GMP=yes
 CONFIG_GOLOMB=yes
 !CONFIG_GPLV3=yes
 CONFIG_H263DSP=yes
@@ -709,11 +732,12 @@ CONFIG_IMDCT15=yes
 CONFIG_INTRAX8=yes
 CONFIG_IVIDSP=yes
 CONFIG_JPEGTABLES=yes
-!CONFIG_LIBX262=yes
 !CONFIG_LGPLV3=yes
+!CONFIG_LIBX262=yes
 CONFIG_LLAUDDSP=yes
 CONFIG_LLVIDDSP=yes
 CONFIG_LPC=yes
+CONFIG_LZF=yes
 CONFIG_ME_CMP=yes
 CONFIG_MPEG_ER=yes
 CONFIG_MPEGAUDIO=yes
@@ -784,6 +808,7 @@ CONFIG_C93_DECODER=yes
 CONFIG_CAVS_DECODER=yes
 CONFIG_CDGRAPHICS_DECODER=yes
 CONFIG_CDXL_DECODER=yes
+CONFIG_CFHD_DECODER=yes
 CONFIG_CINEPAK_DECODER=yes
 CONFIG_CLJR_DECODER=yes
 CONFIG_CLLC_DECODER=yes
@@ -797,9 +822,11 @@ CONFIG_DIRAC_DECODER=yes
 CONFIG_DNXHD_DECODER=yes
 CONFIG_DPX_DECODER=yes
 CONFIG_DSICINVIDEO_DECODER=yes
+CONFIG_DVAUDIO_DECODER=yes
 CONFIG_DVVIDEO_DECODER=yes
 CONFIG_DXA_DECODER=yes
 CONFIG_DXTORY_DECODER=yes
+CONFIG_DXV_DECODER=yes
 CONFIG_EACMV_DECODER=yes
 CONFIG_EAMAD_DECODER=yes
 CONFIG_EATGQ_DECODER=yes
@@ -841,7 +868,6 @@ CONFIG_HQ_HQA_DECODER=yes
 CONFIG_HQX_DECODER=yes
 CONFIG_HUFFYUV_DECODER=yes
 CONFIG_IDCIN_DECODER=yes
-CONFIG_IFF_BYTERUN1_DECODER=yes
 CONFIG_IFF_ILBM_DECODER=yes
 CONFIG_INDEO2_DECODER=yes
 CONFIG_INDEO3_DECODER=yes
@@ -866,10 +892,12 @@ CONFIG_MPEG1VIDEO_DECODER=yes
 CONFIG_MPEG2VIDEO_DECODER=yes
 CONFIG_MPEG4_DECODER=yes
 !CONFIG_MPEG4_CRYSTALHD_DECODER=yes
+!CONFIG_MPEG4_MMAL_DECODER=yes
 !CONFIG_MPEG4_VDPAU_DECODER=yes
 CONFIG_MPEGVIDEO_DECODER=yes
 !CONFIG_MPEG_VDPAU_DECODER=yes
 !CONFIG_MPEG1_VDPAU_DECODER=yes
+!CONFIG_MPEG2_MMAL_DECODER=yes
 !CONFIG_MPEG2_CRYSTALHD_DECODER=yes
 !CONFIG_MPEG2_QSV_DECODER=yes
 CONFIG_MSA1_DECODER=yes
@@ -908,12 +936,15 @@ CONFIG_RAWVIDEO_DECODER=yes
 CONFIG_RL2_DECODER=yes
 CONFIG_ROQ_DECODER=yes
 CONFIG_RPZA_DECODER=yes
+CONFIG_RSCC_DECODER=yes
 CONFIG_RV10_DECODER=yes
 CONFIG_RV20_DECODER=yes
 CONFIG_RV30_DECODER=yes
 CONFIG_RV40_DECODER=yes
 CONFIG_S302M_DECODER=yes
 CONFIG_SANM_DECODER=yes
+CONFIG_SCREENPRESSO_DECODER=yes
+CONFIG_SDX2_DPCM_DECODER=yes
 CONFIG_SGI_DECODER=yes
 CONFIG_SGIRLE_DECODER=yes
 CONFIG_SMACKER_DECODER=yes
@@ -950,6 +981,7 @@ CONFIG_VC1_DECODER=yes
 !CONFIG_VC1_CRYSTALHD_DECODER=yes
 !CONFIG_VC1_VDPAU_DECODER=yes
 CONFIG_VC1IMAGE_DECODER=yes
+!CONFIG_VC1_MMAL_DECODER=yes
 !CONFIG_VC1_QSV_DECODER=yes
 CONFIG_VCR1_DECODER=yes
 CONFIG_VMDVIDEO_DECODER=yes
@@ -1018,6 +1050,7 @@ CONFIG_GSM_DECODER=yes
 CONFIG_GSM_MS_DECODER=yes
 CONFIG_IAC_DECODER=yes
 CONFIG_IMC_DECODER=yes
+CONFIG_INTERPLAY_ACM_DECODER=yes
 CONFIG_MACE3_DECODER=yes
 CONFIG_MACE6_DECODER=yes
 CONFIG_METASOUND_DECODER=yes
@@ -1061,6 +1094,8 @@ CONFIG_WMAV1_DECODER=yes
 CONFIG_WMAV2_DECODER=yes
 CONFIG_WMAVOICE_DECODER=yes
 CONFIG_WS_SND1_DECODER=yes
+CONFIG_XMA1_DECODER=yes
+CONFIG_XMA2_DECODER=yes
 CONFIG_PCM_ALAW_DECODER=yes
 CONFIG_PCM_BLURAY_DECODER=yes
 CONFIG_PCM_DVD_DECODER=yes
@@ -1098,6 +1133,7 @@ CONFIG_XAN_DPCM_DECODER=yes
 CONFIG_ADPCM_4XM_DECODER=yes
 CONFIG_ADPCM_ADX_DECODER=yes
 CONFIG_ADPCM_AFC_DECODER=yes
+CONFIG_ADPCM_AICA_DECODER=yes
 CONFIG_ADPCM_CT_DECODER=yes
 CONFIG_ADPCM_DTK_DECODER=yes
 CONFIG_ADPCM_EA_DECODER=yes
@@ -1123,6 +1159,7 @@ CONFIG_ADPCM_IMA_SMJPEG_DECODER=yes
 CONFIG_ADPCM_IMA_WAV_DECODER=yes
 CONFIG_ADPCM_IMA_WS_DECODER=yes
 CONFIG_ADPCM_MS_DECODER=yes
+CONFIG_ADPCM_PSX_DECODER=yes
 CONFIG_ADPCM_SBPRO_2_DECODER=yes
 CONFIG_ADPCM_SBPRO_3_DECODER=yes
 CONFIG_ADPCM_SBPRO_4_DECODER=yes
@@ -1132,7 +1169,6 @@ CONFIG_ADPCM_THP_LE_DECODER=yes
 CONFIG_ADPCM_VIMA_DECODER=yes
 CONFIG_ADPCM_XA_DECODER=yes
 CONFIG_ADPCM_YAMAHA_DECODER=yes
-CONFIG_VIMA_DECODER=yes
 CONFIG_SSA_DECODER=yes
 !CONFIG_ASS_DECODER=yes
 CONFIG_CCAPTION_DECODER=yes
@@ -1167,7 +1203,6 @@ CONFIG_XSUB_DECODER=yes
 !CONFIG_LIBOPUS_DECODER=yes
 !CONFIG_LIBSCHROEDINGER_DECODER=yes
 !CONFIG_LIBSPEEX_DECODER=yes
-!CONFIG_LIBSTAGEFRIGHT_H264_DECODER=yes
 !CONFIG_LIBUTVIDEO_DECODER=yes
 !CONFIG_LIBVORBIS_DECODER=yes
 !CONFIG_LIBVPX_VP8_DECODER=yes
@@ -1179,9 +1214,11 @@ CONFIG_IDF_DECODER=yes
 CONFIG_AA_DEMUXER=yes
 CONFIG_AAC_DEMUXER=yes
 CONFIG_AC3_DEMUXER=yes
+CONFIG_ACM_DEMUXER=yes
 CONFIG_ACT_DEMUXER=yes
 CONFIG_ADF_DEMUXER=yes
 CONFIG_ADP_DEMUXER=yes
+CONFIG_ADS_DEMUXER=yes
 CONFIG_ADX_DEMUXER=yes
 CONFIG_AEA_DEMUXER=yes
 CONFIG_AFC_DEMUXER=yes
@@ -1219,6 +1256,7 @@ CONFIG_CINE_DEMUXER=yes
 CONFIG_CONCAT_DEMUXER=yes
 CONFIG_DATA_DEMUXER=yes
 CONFIG_DAUD_DEMUXER=yes
+CONFIG_DCSTR_DEMUXER=yes
 CONFIG_DFA_DEMUXER=yes
 CONFIG_DIRAC_DEMUXER=yes
 CONFIG_DNXHD_DEMUXER=yes
@@ -1243,9 +1281,11 @@ CONFIG_FLV_DEMUXER=yes
 CONFIG_LIVE_FLV_DEMUXER=yes
 CONFIG_FOURXM_DEMUXER=yes
 CONFIG_FRM_DEMUXER=yes
+CONFIG_FSB_DEMUXER=yes
 CONFIG_G722_DEMUXER=yes
 CONFIG_G723_1_DEMUXER=yes
 CONFIG_G729_DEMUXER=yes
+CONFIG_GENH_DEMUXER=yes
 CONFIG_GIF_DEMUXER=yes
 CONFIG_GSM_DEMUXER=yes
 CONFIG_GXF_DEMUXER=yes
@@ -1270,9 +1310,9 @@ CONFIG_IRCAM_DEMUXER=yes
 CONFIG_ISS_DEMUXER=yes
 CONFIG_IV8_DEMUXER=yes
 CONFIG_IVF_DEMUXER=yes
+CONFIG_IVR_DEMUXER=yes
 !CONFIG_JACOSUB_DEMUXER=yes
 CONFIG_JV_DEMUXER=yes
-CONFIG_LATM_DEMUXER=yes
 CONFIG_LMLM4_DEMUXER=yes
 CONFIG_LOAS_DEMUXER=yes
 CONFIG_LRC_DEMUXER=yes
@@ -1298,6 +1338,7 @@ CONFIG_MPEGVIDEO_DEMUXER=yes
 CONFIG_MPJPEG_DEMUXER=yes
 !CONFIG_MPL2_DEMUXER=yes
 CONFIG_MPSUB_DEMUXER=yes
+CONFIG_MSF_DEMUXER=yes
 CONFIG_MSNWC_TCP_DEMUXER=yes
 CONFIG_MTV_DEMUXER=yes
 CONFIG_MV_DEMUXER=yes
@@ -1370,22 +1411,28 @@ CONFIG_STL_DEMUXER=yes
 !CONFIG_SUBVIEWER1_DEMUXER=yes
 !CONFIG_SUBVIEWER_DEMUXER=yes
 CONFIG_SUP_DEMUXER=yes
+CONFIG_SVAG_DEMUXER=yes
 CONFIG_SWF_DEMUXER=yes
 CONFIG_TAK_DEMUXER=yes
 CONFIG_TEDCAPTIONS_DEMUXER=yes
 CONFIG_THP_DEMUXER=yes
+CONFIG_THREEDOSTR_DEMUXER=yes
 CONFIG_TIERTEXSEQ_DEMUXER=yes
 CONFIG_TMV_DEMUXER=yes
 CONFIG_TRUEHD_DEMUXER=yes
 CONFIG_TTA_DEMUXER=yes
 CONFIG_TXD_DEMUXER=yes
 CONFIG_TTY_DEMUXER=yes
+CONFIG_V210_DEMUXER=yes
+CONFIG_V210X_DEMUXER=yes
+CONFIG_VAG_DEMUXER=yes
 CONFIG_VC1_DEMUXER=yes
 CONFIG_VC1T_DEMUXER=yes
 CONFIG_VIVO_DEMUXER=yes
 CONFIG_VMD_DEMUXER=yes
 CONFIG_VOBSUB_DEMUXER=yes
 CONFIG_VOC_DEMUXER=yes
+CONFIG_VPK_DEMUXER=yes
 !CONFIG_VPLAYER_DEMUXER=yes
 CONFIG_VQF_DEMUXER=yes
 CONFIG_W64_DEMUXER=yes
@@ -1396,10 +1443,12 @@ CONFIG_WEBVTT_DEMUXER=yes
 CONFIG_WSAUD_DEMUXER=yes
 CONFIG_WSVQA_DEMUXER=yes
 CONFIG_WTV_DEMUXER=yes
+CONFIG_WVE_DEMUXER=yes
 CONFIG_WV_DEMUXER=yes
 CONFIG_XA_DEMUXER=yes
 CONFIG_XBIN_DEMUXER=yes
 CONFIG_XMV_DEMUXER=yes
+CONFIG_XVAG_DEMUXER=yes
 CONFIG_XWMA_DEMUXER=yes
 CONFIG_YOP_DEMUXER=yes
 CONFIG_YUV4MPEGPIPE_DEMUXER=yes
@@ -1420,7 +1469,6 @@ CONFIG_IMAGE_WEBP_PIPE_DEMUXER=yes
 !CONFIG_LIBGME_DEMUXER=yes
 !CONFIG_LIBMODPLUG_DEMUXER=yes
 !CONFIG_LIBNUT_DEMUXER=yes
-!CONFIG_LIBQUVI_DEMUXER=yes
 CONFIG_A64MULTI_ENCODER=yes
 CONFIG_A64MULTI5_ENCODER=yes
 CONFIG_ALIAS_PIX_ENCODER=yes
@@ -1488,6 +1536,8 @@ CONFIG_V210_ENCODER=yes
 CONFIG_V308_ENCODER=yes
 CONFIG_V408_ENCODER=yes
 CONFIG_V410_ENCODER=yes
+CONFIG_VC2_ENCODER=yes
+CONFIG_WRAPPED_AVFRAME_ENCODER=yes
 CONFIG_WMV1_ENCODER=yes
 CONFIG_WMV2_ENCODER=yes
 CONFIG_XBM_ENCODER=yes
@@ -1558,6 +1608,7 @@ CONFIG_DVDSUB_ENCODER=yes
 CONFIG_MOVTEXT_ENCODER=yes
 CONFIG_SRT_ENCODER=yes
 CONFIG_SUBRIP_ENCODER=yes
+CONFIG_TEXT_ENCODER=yes
 CONFIG_WEBVTT_ENCODER=yes
 CONFIG_XSUB_ENCODER=yes
 !CONFIG_LIBFAAC_ENCODER=yes
@@ -1575,7 +1626,6 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_LIBTHEORA_ENCODER=yes
 !CONFIG_LIBTWOLAME_ENCODER=yes
 !CONFIG_LIBUTVIDEO_ENCODER=yes
-!CONFIG_LIBVO_AACENC_ENCODER=yes
 !CONFIG_LIBVO_AMRWBENC_ENCODER=yes
 !CONFIG_LIBVORBIS_ENCODER=yes
 !CONFIG_LIBVPX_VP8_ENCODER=yes
@@ -1589,7 +1639,6 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_LIBX265_ENCODER=yes
 !CONFIG_LIBXAVS_ENCODER=yes
 !CONFIG_LIBXVID_ENCODER=yes
-!CONFIG_LIBAACPLUS_ENCODER=yes
 !CONFIG_LIBOPENH264_ENCODER=yes
 !CONFIG_H264_QSV_ENCODER=yes
 !CONFIG_NVENC_ENCODER=yes
@@ -1598,20 +1647,29 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_HEVC_QSV_ENCODER=yes
 !CONFIG_LIBKVAZAAR_ENCODER=yes
 !CONFIG_MPEG2_QSV_ENCODER=yes
+!CONFIG_ACOMPRESSOR_FILTER=yes
 !CONFIG_ACROSSFADE_FILTER=yes
 !CONFIG_ADELAY_FILTER=yes
 !CONFIG_AECHO_FILTER=yes
+!CONFIG_AEMPHASIS_FILTER=yes
 !CONFIG_AEVAL_FILTER=yes
 !CONFIG_AFADE_FILTER=yes
+!CONFIG_AFFTFILT_FILTER=yes
 !CONFIG_AFORMAT_FILTER=yes
+!CONFIG_AGATE_FILTER=yes
 !CONFIG_AINTERLEAVE_FILTER=yes
+!CONFIG_ALIMITER_FILTER=yes
 !CONFIG_ALLPASS_FILTER=yes
 !CONFIG_AMERGE_FILTER=yes
+!CONFIG_AMETADATA_FILTER=yes
 !CONFIG_AMIX_FILTER=yes
+!CONFIG_ANEQUALIZER_FILTER=yes
 !CONFIG_ANULL_FILTER=yes
 !CONFIG_APAD_FILTER=yes
 !CONFIG_APERMS_FILTER=yes
 !CONFIG_APHASER_FILTER=yes
+!CONFIG_APULSATOR_FILTER=yes
+!CONFIG_AREALTIME_FILTER=yes
 !CONFIG_ARESAMPLE_FILTER=yes
 !CONFIG_AREVERSE_FILTER=yes
 !CONFIG_ASELECT_FILTER=yes
@@ -1623,7 +1681,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_ASHOWINFO_FILTER=yes
 !CONFIG_ASPLIT_FILTER=yes
 !CONFIG_ASTATS_FILTER=yes
-!CONFIG_ASTREAMSYNC_FILTER=yes
+!CONFIG_ASTREAMSELECT_FILTER=yes
 !CONFIG_ASYNCTS_FILTER=yes
 !CONFIG_ATEMPO_FILTER=yes
 !CONFIG_ATRIM_FILTER=yes
@@ -1637,11 +1695,13 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_CHANNELSPLIT_FILTER=yes
 !CONFIG_CHORUS_FILTER=yes
 !CONFIG_COMPAND_FILTER=yes
+!CONFIG_COMPENSATIONDELAY_FILTER=yes
 !CONFIG_DCSHIFT_FILTER=yes
 !CONFIG_DYNAUDNORM_FILTER=yes
 !CONFIG_EARWAX_FILTER=yes
 !CONFIG_EBUR128_FILTER=yes
 !CONFIG_EQUALIZER_FILTER=yes
+!CONFIG_EXTRASTEREO_FILTER=yes
 !CONFIG_FLANGER_FILTER=yes
 !CONFIG_HIGHPASS_FILTER=yes
 !CONFIG_JOIN_FILTER=yes
@@ -1650,13 +1710,21 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_PAN_FILTER=yes
 !CONFIG_REPLAYGAIN_FILTER=yes
 !CONFIG_RESAMPLE_FILTER=yes
+!CONFIG_RUBBERBAND_FILTER=yes
 !CONFIG_SIDECHAINCOMPRESS_FILTER=yes
+!CONFIG_SIDECHAINGATE_FILTER=yes
 !CONFIG_SILENCEDETECT_FILTER=yes
 !CONFIG_SILENCEREMOVE_FILTER=yes
+!CONFIG_SOFALIZER_FILTER=yes
+!CONFIG_STEREOTOOLS_FILTER=yes
+!CONFIG_STEREOWIDEN_FILTER=yes
 !CONFIG_TREBLE_FILTER=yes
+!CONFIG_TREMOLO_FILTER=yes
+!CONFIG_VIBRATO_FILTER=yes
 !CONFIG_VOLUME_FILTER=yes
 !CONFIG_VOLUMEDETECT_FILTER=yes
 !CONFIG_AEVALSRC_FILTER=yes
+!CONFIG_ANOISESRC_FILTER=yes
 !CONFIG_ANULLSRC_FILTER=yes
 !CONFIG_FLITE_FILTER=yes
 !CONFIG_SINE_FILTER=yes
@@ -1670,12 +1738,14 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_BLACKFRAME_FILTER=yes
 !CONFIG_BLEND_FILTER=yes
 !CONFIG_BOXBLUR_FILTER=yes
+!CONFIG_CHROMAKEY_FILTER=yes
 !CONFIG_CODECVIEW_FILTER=yes
 !CONFIG_COLORBALANCE_FILTER=yes
 !CONFIG_COLORCHANNELMIXER_FILTER=yes
 !CONFIG_COLORKEY_FILTER=yes
 !CONFIG_COLORLEVELS_FILTER=yes
 !CONFIG_COLORMATRIX_FILTER=yes
+!CONFIG_CONVOLUTION_FILTER=yes
 !CONFIG_COPY_FILTER=yes
 !CONFIG_COVER_RECT_FILTER=yes
 !CONFIG_CROP_FILTER=yes
@@ -1690,6 +1760,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_DESHAKE_FILTER=yes
 !CONFIG_DETELECINE_FILTER=yes
 !CONFIG_DILATION_FILTER=yes
+!CONFIG_DISPLACE_FILTER=yes
 !CONFIG_DRAWBOX_FILTER=yes
 !CONFIG_DRAWGRAPH_FILTER=yes
 !CONFIG_DRAWGRID_FILTER=yes
@@ -1733,13 +1804,17 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_LUT_FILTER=yes
 !CONFIG_LUTRGB_FILTER=yes
 !CONFIG_LUTYUV_FILTER=yes
+!CONFIG_MASKEDMERGE_FILTER=yes
 !CONFIG_MCDEINT_FILTER=yes
 !CONFIG_MERGEPLANES_FILTER=yes
+!CONFIG_METADATA_FILTER=yes
 !CONFIG_MPDECIMATE_FILTER=yes
 !CONFIG_NEGATE_FILTER=yes
+!CONFIG_NNEDI_FILTER=yes
 !CONFIG_NOFORMAT_FILTER=yes
 !CONFIG_NOISE_FILTER=yes
 !CONFIG_NULL_FILTER=yes
+!CONFIG_OCR_FILTER=yes
 !CONFIG_OCV_FILTER=yes
 !CONFIG_OVERLAY_FILTER=yes
 !CONFIG_OWDENOISE_FILTER=yes
@@ -1756,6 +1831,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_PULLUP_FILTER=yes
 !CONFIG_QP_FILTER=yes
 !CONFIG_RANDOM_FILTER=yes
+!CONFIG_REALTIME_FILTER=yes
 !CONFIG_REMOVEGRAIN_FILTER=yes
 !CONFIG_REMOVELOGO_FILTER=yes
 !CONFIG_REPEATFIELDS_FILTER=yes
@@ -1765,6 +1841,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_SCALE_FILTER=yes
 !CONFIG_SCALE2REF_FILTER=yes
 !CONFIG_SELECT_FILTER=yes
+!CONFIG_SELECTIVECOLOR_FILTER=yes
 !CONFIG_SENDCMD_FILTER=yes
 !CONFIG_SEPARATEFIELDS_FILTER=yes
 !CONFIG_SETDAR_FILTER=yes
@@ -1774,6 +1851,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_SETTB_FILTER=yes
 !CONFIG_SHOWINFO_FILTER=yes
 !CONFIG_SHOWPALETTE_FILTER=yes
+!CONFIG_SHUFFLEFRAMES_FILTER=yes
 !CONFIG_SHUFFLEPLANES_FILTER=yes
 !CONFIG_SIGNALSTATS_FILTER=yes
 !CONFIG_SMARTBLUR_FILTER=yes
@@ -1781,8 +1859,10 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_SPP_FILTER=yes
 !CONFIG_SSIM_FILTER=yes
 !CONFIG_STEREO3D_FILTER=yes
+!CONFIG_STREAMSELECT_FILTER=yes
 !CONFIG_SUBTITLES_FILTER=yes
 !CONFIG_SUPER2XSAI_FILTER=yes
+!CONFIG_SWAPRECT_FILTER=yes
 !CONFIG_SWAPUV_FILTER=yes
 !CONFIG_TBLEND_FILTER=yes
 !CONFIG_TELECINE_FILTER=yes
@@ -1805,6 +1885,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_YADIF_FILTER=yes
 !CONFIG_ZMQ_FILTER=yes
 !CONFIG_ZOOMPAN_FILTER=yes
+!CONFIG_ZSCALE_FILTER=yes
 !CONFIG_ALLRGB_FILTER=yes
 !CONFIG_ALLYUV_FILTER=yes
 !CONFIG_CELLAUTO_FILTER=yes
@@ -1819,21 +1900,24 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_SMPTEBARS_FILTER=yes
 !CONFIG_SMPTEHDBARS_FILTER=yes
 !CONFIG_TESTSRC_FILTER=yes
+!CONFIG_TESTSRC2_FILTER=yes
 !CONFIG_NULLSINK_FILTER=yes
 !CONFIG_ADRAWGRAPH_FILTER=yes
+!CONFIG_AHISTOGRAM_FILTER=yes
 !CONFIG_APHASEMETER_FILTER=yes
 !CONFIG_AVECTORSCOPE_FILTER=yes
 !CONFIG_CONCAT_FILTER=yes
 !CONFIG_SHOWCQT_FILTER=yes
 !CONFIG_SHOWFREQS_FILTER=yes
 !CONFIG_SHOWSPECTRUM_FILTER=yes
+!CONFIG_SHOWSPECTRUMPIC_FILTER=yes
 !CONFIG_SHOWVOLUME_FILTER=yes
 !CONFIG_SHOWWAVES_FILTER=yes
 !CONFIG_SHOWWAVESPIC_FILTER=yes
+!CONFIG_SPECTRUMSYNTH_FILTER=yes
 !CONFIG_AMOVIE_FILTER=yes
 !CONFIG_MOVIE_FILTER=yes
 !CONFIG_H263_VAAPI_HWACCEL=yes
-!CONFIG_H263_VDPAU_HWACCEL=yes
 !CONFIG_H263_VIDEOTOOLBOX_HWACCEL=yes
 !CONFIG_H264_D3D11VA_HWACCEL=yes
 !CONFIG_H264_DXVA2_HWACCEL=yes
@@ -1855,10 +1939,12 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_MPEG2_XVMC_HWACCEL=yes
 !CONFIG_MPEG2_D3D11VA_HWACCEL=yes
 !CONFIG_MPEG2_DXVA2_HWACCEL=yes
+!CONFIG_MPEG2_MMAL_HWACCEL=yes
 !CONFIG_MPEG2_QSV_HWACCEL=yes
 !CONFIG_MPEG2_VAAPI_HWACCEL=yes
 !CONFIG_MPEG2_VDPAU_HWACCEL=yes
 !CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL=yes
+!CONFIG_MPEG4_MMAL_HWACCEL=yes
 !CONFIG_MPEG4_VAAPI_HWACCEL=yes
 !CONFIG_MPEG4_VDPAU_HWACCEL=yes
 !CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL=yes
@@ -1866,7 +1952,11 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_VC1_DXVA2_HWACCEL=yes
 !CONFIG_VC1_VAAPI_HWACCEL=yes
 !CONFIG_VC1_VDPAU_HWACCEL=yes
+!CONFIG_VC1_MMAL_HWACCEL=yes
 !CONFIG_VC1_QSV_HWACCEL=yes
+!CONFIG_VP9_D3D11VA_HWACCEL=yes
+!CONFIG_VP9_DXVA2_HWACCEL=yes
+!CONFIG_VP9_VAAPI_HWACCEL=yes
 !CONFIG_WMV3_D3D11VA_HWACCEL=yes
 !CONFIG_WMV3_DXVA2_HWACCEL=yes
 !CONFIG_WMV3_VAAPI_HWACCEL=yes
@@ -2036,6 +2126,7 @@ CONFIG_WEBVTT_MUXER=yes
 CONFIG_WTV_MUXER=yes
 CONFIG_WV_MUXER=yes
 CONFIG_YUV4MPEGPIPE_MUXER=yes
+!CONFIG_CHROMAPRINT_MUXER=yes
 !CONFIG_LIBNUT_MUXER=yes
 !CONFIG_ALSA_OUTDEV=yes
 !CONFIG_CACA_OUTDEV=yes
@@ -2059,6 +2150,7 @@ CONFIG_DCA_PARSER=yes
 CONFIG_DIRAC_PARSER=yes
 CONFIG_DNXHD_PARSER=yes
 CONFIG_DPX_PARSER=yes
+CONFIG_DVAUDIO_PARSER=yes
 CONFIG_DVBSUB_PARSER=yes
 CONFIG_DVDSUB_PARSER=yes
 CONFIG_DVD_NAV_PARSER=yes
@@ -2116,6 +2208,7 @@ CONFIG_RTP_PROTOCOL=yes
 CONFIG_SRTP_PROTOCOL=yes
 CONFIG_SUBFILE_PROTOCOL=yes
 CONFIG_TCP_PROTOCOL=yes
+!CONFIG_TLS_SCHANNEL_PROTOCOL=yes
 !CONFIG_TLS_SECURETRANSPORT_PROTOCOL=yes
 !CONFIG_TLS_GNUTLS_PROTOCOL=yes
 !CONFIG_TLS_OPENSSL_PROTOCOL=yes
diff --git a/android/include/config-armv5te.h b/android/include/config-armv5te.h
index 3858fbbbe2..92f19d3c86 100644
--- a/android/include/config-armv5te.h
+++ b/android/include/config-armv5te.h
@@ -3,7 +3,7 @@
 #define FFMPEG_CONFIG_H
 #define FFMPEG_CONFIGURATION "--arch=arm --cpu=armv5te --build_suffix= --cross-prefix=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi- --enable-cross-compile --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-arm --target-os=linux --disable-static --enable-shared --enable-optimizations --disable-doc --disable-symver --disable-ffmpeg --disable-ffplay --disable-ffprobe --disable-ffserver --disable-avdevice --disable-devices --disable-filters --disable-demuxer=srt --disable-demuxer=microdvd --disable-demuxer=jacosub --disable-demuxer=sami --disable-demuxer=realtext --disable-demuxer=dts --disable-demuxer=subviewer --disable-demuxer=subviewer1 --disable-demuxer=pjs --disable-demuxer=vplayer --disable-demuxer=mpl2 --disable-decoder=ass --disable-decoder=srt --disable-decoder=subrip --disable-decoder=microdvd --disable-decoder=jacosub --disable-decoder=sami --disable-decoder=realtext --disable-decoder=movtext --disable-decoder=subviewer --disable-decoder=subviewer1 --disable-decoder=pjs --disable-decoder=vplayer --disable-decoder=mpl2 --enable-zlib --enable-pic --disable-debug"
 #define FFMPEG_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
diff --git a/android/include/config-armv7-a-neon.h b/android/include/config-armv7-a-neon.h
index 6a4bb17e75..70f7ba98b2 100644
--- a/android/include/config-armv7-a-neon.h
+++ b/android/include/config-armv7-a-neon.h
@@ -3,7 +3,7 @@
 #define FFMPEG_CONFIG_H
 #define FFMPEG_CONFIGURATION "--arch=arm --cpu=armv7-a --build_suffix= --cross-prefix=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi- --enable-cross-compile --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-arm --target-os=linux --disable-static --enable-shared --enable-optimizations --disable-doc --disable-symver --disable-ffmpeg --disable-ffplay --disable-ffprobe --disable-ffserver --disable-avdevice --disable-devices --disable-filters --disable-demuxer=srt --disable-demuxer=microdvd --disable-demuxer=jacosub --disable-demuxer=sami --disable-demuxer=realtext --disable-demuxer=dts --disable-demuxer=subviewer --disable-demuxer=subviewer1 --disable-demuxer=pjs --disable-demuxer=vplayer --disable-demuxer=mpl2 --disable-decoder=ass --disable-decoder=srt --disable-decoder=subrip --disable-decoder=microdvd --disable-decoder=jacosub --disable-decoder=sami --disable-decoder=realtext --disable-decoder=movtext --disable-decoder=subviewer --disable-decoder=subviewer1 --disable-decoder=pjs --disable-decoder=vplayer --disable-decoder=mpl2 --enable-zlib --enable-pic --disable-debug"
 #define FFMPEG_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
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
diff --git a/android/include/config-armv8-a.h b/android/include/config-armv8-a.h
index 8ecaa4f162..38a37b675d 100644
--- a/android/include/config-armv8-a.h
+++ b/android/include/config-armv8-a.h
@@ -3,7 +3,7 @@
 #define FFMPEG_CONFIG_H
 #define FFMPEG_CONFIGURATION "--arch=aarch64 --target-os=linux --enable-cross-compile --cross-prefix=../../prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin/aarch64-linux-android- --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-arm64 --target-os=linux --disable-static --enable-shared --enable-optimizations --disable-doc --disable-symver --disable-ffmpeg --disable-ffplay --disable-ffprobe --disable-ffserver --disable-avdevice --disable-devices --disable-filters --disable-demuxer=srt --disable-demuxer=microdvd --disable-demuxer=jacosub --disable-demuxer=sami --disable-demuxer=realtext --disable-demuxer=dts --disable-demuxer=subviewer --disable-demuxer=subviewer1 --disable-demuxer=pjs --disable-demuxer=vplayer --disable-demuxer=mpl2 --disable-decoder=ass --disable-decoder=srt --disable-decoder=subrip --disable-decoder=microdvd --disable-decoder=jacosub --disable-decoder=sami --disable-decoder=realtext --disable-decoder=movtext --disable-decoder=subviewer --disable-decoder=subviewer1 --disable-decoder=pjs --disable-decoder=vplayer --disable-decoder=mpl2 --enable-zlib --enable-pic --disable-debug"
 #define FFMPEG_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
diff --git a/android/include/config-silvermont.h b/android/include/config-silvermont.h
index f14be7273c..28f1b5a761 100644
--- a/android/include/config-silvermont.h
+++ b/android/include/config-silvermont.h
@@ -3,7 +3,7 @@
 #define FFMPEG_CONFIG_H
 #define FFMPEG_CONFIGURATION "--arch=x86 --cpu=silvermont --build_suffix= --cross-prefix=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android- --enable-cross-compile --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-x86 --target-os=linux --extra-cflags=-m32 --disable-static --enable-shared --enable-optimizations --disable-doc --disable-symver --disable-ffmpeg --disable-ffplay --disable-ffprobe --disable-ffserver --disable-avdevice --disable-devices --disable-filters --disable-demuxer=srt --disable-demuxer=microdvd --disable-demuxer=jacosub --disable-demuxer=sami --disable-demuxer=realtext --disable-demuxer=dts --disable-demuxer=subviewer --disable-demuxer=subviewer1 --disable-demuxer=pjs --disable-demuxer=vplayer --disable-demuxer=mpl2 --disable-decoder=ass --disable-decoder=srt --disable-decoder=subrip --disable-decoder=microdvd --disable-decoder=jacosub --disable-decoder=sami --disable-decoder=realtext --disable-decoder=movtext --disable-decoder=subviewer --disable-decoder=subviewer1 --disable-decoder=pjs --disable-decoder=vplayer --disable-decoder=mpl2 --enable-zlib --enable-pic --disable-debug"
 #define FFMPEG_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 (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 1
 #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 1
 #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 1
 #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 1
 #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 1
 #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
diff --git a/android/include/config-x86.h b/android/include/config-x86.h
index 4d12d9e532..236464e605 100644
--- a/android/include/config-x86.h
+++ b/android/include/config-x86.h
@@ -3,7 +3,7 @@
 #define FFMPEG_CONFIG_H
 #define FFMPEG_CONFIGURATION "--arch=x86 --cpu=i686 --build_suffix= --cross-prefix=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android- --enable-cross-compile --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-x86 --target-os=linux --extra-cflags=-m32 --disable-static --enable-shared --enable-optimizations --disable-doc --disable-symver --disable-ffmpeg --disable-ffplay --disable-ffprobe --disable-ffserver --disable-avdevice --disable-devices --disable-filters --disable-demuxer=srt --disable-demuxer=microdvd --disable-demuxer=jacosub --disable-demuxer=sami --disable-demuxer=realtext --disable-demuxer=dts --disable-demuxer=subviewer --disable-demuxer=subviewer1 --disable-demuxer=pjs --disable-demuxer=vplayer --disable-demuxer=mpl2 --disable-decoder=ass --disable-decoder=srt --disable-decoder=subrip --disable-decoder=microdvd --disable-decoder=jacosub --disable-decoder=sami --disable-decoder=realtext --disable-decoder=movtext --disable-decoder=subviewer --disable-decoder=subviewer1 --disable-decoder=pjs --disable-decoder=vplayer --disable-decoder=mpl2 --enable-zlib --enable-pic --disable-debug"
 #define FFMPEG_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 (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 1
 #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 1
 #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 1
 #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 1
 #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 1
 #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
diff --git a/android/include/config.asm b/android/include/config.asm
index 59bbfa9505..77a1861e15 100644
--- a/android/include/config.asm
+++ b/android/include/config.asm
@@ -36,6 +36,7 @@
 %define HAVE_POWER8 0
 %define HAVE_PPC4XX 0
 %define HAVE_VSX 0
+%define HAVE_AESNI 1
 %define HAVE_AMD3DNOW 1
 %define HAVE_AMD3DNOWEXT 1
 %define HAVE_AVX 1
@@ -55,9 +56,10 @@
 %define HAVE_I686 1
 %define HAVE_MIPSFPU 0
 %define HAVE_MIPS32R2 0
-%define HAVE_MIPS32R5 0
+%define HAVE_MIPS64R2 0
+%define HAVE_MIPS32R6 0
 %define HAVE_MIPS64R6 0
-%define HAVE_MIPSDSPR1 0
+%define HAVE_MIPSDSP 0
 %define HAVE_MIPSDSPR2 0
 %define HAVE_MSA 0
 %define HAVE_LOONGSON2 1
@@ -77,6 +79,7 @@
 %define HAVE_POWER8_EXTERNAL 0
 %define HAVE_PPC4XX_EXTERNAL 0
 %define HAVE_VSX_EXTERNAL 0
+%define HAVE_AESNI_EXTERNAL 1
 %define HAVE_AMD3DNOW_EXTERNAL 1
 %define HAVE_AMD3DNOWEXT_EXTERNAL 1
 %define HAVE_AVX_EXTERNAL 1
@@ -96,9 +99,10 @@
 %define HAVE_I686_EXTERNAL 0
 %define HAVE_MIPSFPU_EXTERNAL 0
 %define HAVE_MIPS32R2_EXTERNAL 0
-%define HAVE_MIPS32R5_EXTERNAL 0
+%define HAVE_MIPS64R2_EXTERNAL 0
+%define HAVE_MIPS32R6_EXTERNAL 0
 %define HAVE_MIPS64R6_EXTERNAL 0
-%define HAVE_MIPSDSPR1_EXTERNAL 0
+%define HAVE_MIPSDSP_EXTERNAL 0
 %define HAVE_MIPSDSPR2_EXTERNAL 0
 %define HAVE_MSA_EXTERNAL 0
 %define HAVE_LOONGSON2_EXTERNAL 0
@@ -118,6 +122,7 @@
 %define HAVE_POWER8_INLINE 0
 %define HAVE_PPC4XX_INLINE 0
 %define HAVE_VSX_INLINE 0
+%define HAVE_AESNI_INLINE 1
 %define HAVE_AMD3DNOW_INLINE 1
 %define HAVE_AMD3DNOWEXT_INLINE 1
 %define HAVE_AVX_INLINE 1
@@ -137,9 +142,10 @@
 %define HAVE_I686_INLINE 0
 %define HAVE_MIPSFPU_INLINE 0
 %define HAVE_MIPS32R2_INLINE 0
-%define HAVE_MIPS32R5_INLINE 0
+%define HAVE_MIPS64R2_INLINE 0
+%define HAVE_MIPS32R6_INLINE 0
 %define HAVE_MIPS64R6_INLINE 0
-%define HAVE_MIPSDSPR1_INLINE 0
+%define HAVE_MIPSDSP_INLINE 0
 %define HAVE_MIPSDSPR2_INLINE 0
 %define HAVE_MSA_INLINE 0
 %define HAVE_LOONGSON2_INLINE 0
@@ -164,6 +170,8 @@
 %define HAVE_RDTSC 0
 %define HAVE_SARESTART 1
 %define HAVE_SYNC_VAL_COMPARE_AND_SWAP 1
+%define HAVE_CABS 0
+%define HAVE_CEXP 0
 %define HAVE_INLINE_ASM 1
 %define HAVE_SYMVER 0
 %define HAVE_YASM 1
@@ -193,6 +201,9 @@
 %define HAVE_MACHINE_IOCTL_BT848_H 0
 %define HAVE_MACHINE_IOCTL_METEOR_H 0
 %define HAVE_MALLOC_H 1
+%define HAVE_OPENCV2_CORE_CORE_C_H 0
+%define HAVE_OPENJPEG_2_1_OPENJPEG_H 0
+%define HAVE_OPENJPEG_2_0_OPENJPEG_H 0
 %define HAVE_OPENJPEG_1_5_OPENJPEG_H 0
 %define HAVE_OPENGL_GL3_H 0
 %define HAVE_POLL_H 1
@@ -223,6 +234,8 @@
 %define HAVE_EXP2 1
 %define HAVE_EXP2F 1
 %define HAVE_EXPF 1
+%define HAVE_HYPOT 1
+%define HAVE_ISFINITE 1
 %define HAVE_ISINF 1
 %define HAVE_ISNAN 1
 %define HAVE_LDEXPF 1
@@ -242,6 +255,7 @@
 %define HAVE_TRUNCF 1
 %define HAVE_ACCESS 1
 %define HAVE_ALIGNED_MALLOC 0
+%define HAVE_ARC4RANDOM 1
 %define HAVE_CLOCK_GETTIME 1
 %define HAVE_CLOSESOCKET 0
 %define HAVE_COMMANDLINETOARGVW 0
@@ -258,7 +272,6 @@
 %define HAVE_GETPROCESSMEMORYINFO 0
 %define HAVE_GETPROCESSTIMES 0
 %define HAVE_GETRUSAGE 1
-%define HAVE_GETSERVBYPORT 1
 %define HAVE_GETSYSTEMTIMEASFILETIME 0
 %define HAVE_GETTIMEOFDAY 1
 %define HAVE_GLOB 0
@@ -291,6 +304,7 @@
 %define HAVE_SYSCONF 1
 %define HAVE_SYSCTL 0
 %define HAVE_USLEEP 1
+%define HAVE_UTGETOSTYPEFROMSTRING 0
 %define HAVE_VIRTUALALLOC 0
 %define HAVE_WGLGETPROCADDRESS 0
 %define HAVE_PTHREADS 1
@@ -307,9 +321,9 @@
 %define HAVE_GNU_AS 0
 %define HAVE_GNU_WINDRES 0
 %define HAVE_IBM_ASM 0
+%define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 1
 %define HAVE_INLINE_ASM_LABELS 1
 %define HAVE_INLINE_ASM_NONLOCAL_LABELS 1
-%define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 1
 %define HAVE_PRAGMA_DEPRECATED 1
 %define HAVE_RSYNC_CONTIMEOUT 1
 %define HAVE_SYMVER_ASM_LABEL 0
@@ -320,7 +334,6 @@
 %define HAVE_CONDITION_VARIABLE_PTR 0
 %define HAVE_SOCKLEN_T 1
 %define HAVE_STRUCT_ADDRINFO 1
-%define HAVE_STRUCT_DCADEC_EXSS_INFO_MATRIX_ENCODING 0
 %define HAVE_STRUCT_GROUP_SOURCE_REQ 1
 %define HAVE_STRUCT_IP_MREQ_SOURCE 1
 %define HAVE_STRUCT_IPV6_MREQ 1
@@ -334,8 +347,8 @@
 %define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 1
 %define HAVE_ATOMICS_NATIVE 1
 %define HAVE_DOS_PATHS 0
-%define HAVE_DXVA2API_COBJ 0
 %define HAVE_DXVA2_LIB 0
+%define HAVE_DXVA2API_COBJ 0
 %define HAVE_LIBC_MSVCRT 0
 %define HAVE_LIBDC1394_1 0
 %define HAVE_LIBDC1394_2 0
@@ -349,17 +362,18 @@
 %define HAVE_THREADS 1
 %define HAVE_VAAPI_X11 0
 %define HAVE_VDPAU_X11 0
+%define HAVE_WINRT 0
 %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
@@ -384,13 +398,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
@@ -421,8 +437,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
@@ -430,13 +446,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
@@ -450,15 +465,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
@@ -526,6 +544,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
@@ -535,8 +554,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
@@ -554,11 +571,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
@@ -629,6 +647,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
@@ -642,9 +661,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
@@ -686,7 +707,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
@@ -711,10 +731,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
@@ -753,12 +775,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
@@ -795,6 +820,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
@@ -863,6 +889,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
@@ -906,6 +933,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
@@ -943,6 +972,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
@@ -968,6 +998,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
@@ -977,7 +1008,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
@@ -1012,7 +1042,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
@@ -1024,9 +1053,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
@@ -1064,6 +1095,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
@@ -1088,9 +1120,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
@@ -1115,9 +1149,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
@@ -1143,6 +1177,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
@@ -1215,22 +1250,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
@@ -1241,10 +1282,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
@@ -1265,7 +1308,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
@@ -1333,6 +1375,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
@@ -1403,6 +1447,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
@@ -1420,7 +1465,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
@@ -1434,7 +1478,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
@@ -1443,20 +1486,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
@@ -1468,7 +1520,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
@@ -1482,11 +1534,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
@@ -1495,13 +1549,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
@@ -1515,12 +1577,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
@@ -1535,6 +1599,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
@@ -1578,13 +1643,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
@@ -1601,6 +1670,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
@@ -1610,6 +1680,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
@@ -1619,6 +1690,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
@@ -1626,8 +1698,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
@@ -1650,6 +1724,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
@@ -1664,21 +1739,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
@@ -1700,10 +1778,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
@@ -1711,7 +1791,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
@@ -1881,6 +1965,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
@@ -1904,6 +1989,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
@@ -1961,6 +2047,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