ffmpeg: Update configurations for FFMPEG 2.8

Change-Id: I438bab0cbb26dfd2fa196fd242b29e76b7a3b312

13 files changed, 1512 insertions, 198 deletions

diff --git a/android/config-armv5te.mak b/android/config-armv5te.mak
index e74012f569..cb496d02de 100644
--- a/android/config-armv5te.mak
+++ b/android/config-armv5te.mak
@@ -1,7 +1,7 @@
 # Automatically generated by configure - do not modify!
 ifndef FFMPEG_CONFIG_MAK
 FFMPEG_CONFIG_MAK=1
-FFMPEG_CONFIGURATION=--arch=arm --cpu=armv5te --build_suffix= --cross-prefix=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8/bin/arm-linux-androideabi- --enable-cross-compile --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-arm --target-os=linux --disable-static --enable-shared --enable-optimizations --disable-doc --disable-symver --disable-ffmpeg --disable-ffplay --disable-ffprobe --disable-ffserver --disable-avdevice --disable-devices --disable-filters --disable-demuxer=srt --disable-demuxer=microdvd --disable-demuxer=jacosub --disable-demuxer=sami --disable-demuxer=realtext --disable-demuxer=dts --disable-demuxer=subviewer --disable-demuxer=subviewer1 --disable-demuxer=pjs --disable-demuxer=vplayer --disable-demuxer=mpl2 --disable-decoder=ass --disable-decoder=srt --disable-decoder=subrip --disable-decoder=microdvd --disable-decoder=jacosub --disable-decoder=sami --disable-decoder=realtext --disable-decoder=movtext --disable-decoder=subviewer --disable-decoder=subviewer1 --disable-decoder=pjs --disable-decoder=vplayer --disable-decoder=mpl2 --enable-zlib --enable-pic --disable-debug
+FFMPEG_CONFIGURATION=--arch=arm --cpu=armv5te --build_suffix= --cross-prefix=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi- --enable-cross-compile --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-arm --target-os=linux --disable-static --enable-shared --enable-optimizations --disable-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
 prefix=/usr/local
 LIBDIR=$(DESTDIR)${prefix}/lib
 SHLIBDIR=$(DESTDIR)${prefix}/lib
@@ -15,24 +15,24 @@ SRC_PATH=.
 ifndef MAIN_MAKEFILE
 SRC_PATH:=$(SRC_PATH:.%=..%)
 endif
-CC_IDENT=gcc 4.8 (GCC)
+CC_IDENT=gcc 4.9.x-google (GCC) 20140827 (prerelease)
 ARCH=arm
 INTRINSICS=none
-CC=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8/bin/arm-linux-androideabi-gcc
-CXX=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8/bin/arm-linux-androideabi-g++
-AS=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8/bin/arm-linux-androideabi-gcc
-LD=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8/bin/arm-linux-androideabi-gcc
-DEPCC=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8/bin/arm-linux-androideabi-gcc
+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
+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)
-DEPAS=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8/bin/arm-linux-androideabi-gcc
+DEPAS=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-gcc
 DEPASFLAGS= $(CPPFLAGS)
 YASM=yasm
 DEPYASM=yasm
-AR=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8/bin/arm-linux-androideabi-ar
+AR=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-ar
 ARFLAGS=rcD
 AR_O=$@
-RANLIB=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8/bin/arm-linux-androideabi-ranlib -D
-STRIP=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8/bin/arm-linux-androideabi-strip
+RANLIB=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-ranlib -D
+STRIP=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-strip
 CP=cp -p
 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
@@ -50,11 +50,12 @@ LD_O=-o $@
 LD_LIB=-l%
 LD_PATH=-L
 DLLTOOL=
-WINDRES=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8/bin/arm-linux-androideabi-windres
-DEPWINDRES=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8/bin/arm-linux-androideabi-gcc
+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
 LDEXEFLAGS=
+LDLIBFLAGS=
 SHFLAGS=-shared -Wl,-soname,$$(@F) -Wl,-Bsymbolic -Wl,--version-script,$(SUBDIR)lib$(NAME).ver
 ASMSTRIPFLAGS= -wN '..@*'
 YASMFLAGS=
@@ -68,13 +69,13 @@ SLIBPREF=lib
 SLIBSUF=.so
 EXESUF=
 EXTRA_VERSION=
-CCDEP=
+CCDEP=$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< | sed -e "/^\#.*/d" -e "s,^[[:space:]]*$(*F)\\.o,$(@D)/$(*F).o," > $(@:.o=.d)
 CXXDEP=
-CCDEP_FLAGS=
-ASDEP=
-ASDEP_FLAGS=
-CC_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@
-AS_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@
+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=
 HOSTCC=gcc
 HOSTLD=gcc
 HOSTCFLAGS=  -std=c99 -Wall -O3
@@ -84,9 +85,9 @@ HOSTLDFLAGS=
 HOSTLIBS=-lm
 DEPHOSTCC=gcc
 DEPHOSTCCFLAGS= $(HOSTCCFLAGS)
-HOSTCCDEP=
-HOSTCCDEP_FLAGS=
-HOSTCC_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@
+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=
 HOSTCC_C=-c
 HOSTCC_O=-o $@
 HOSTLD_O=-o $@
@@ -112,28 +113,28 @@ SLIB_INSTALL_EXTRA_LIB=
 SLIB_INSTALL_EXTRA_SHLIB=
 SAMPLES:=$(FATE_SAMPLES)
 NOREDZONE_FLAGS=
-libavcodec_VERSION=56.41.100
+libavcodec_VERSION=56.60.100
 libavcodec_VERSION_MAJOR=56
-libavcodec_VERSION_MINOR=41
+libavcodec_VERSION_MINOR=60
 libavdevice_VERSION=56.4.100
 libavdevice_VERSION_MAJOR=56
 libavdevice_VERSION_MINOR=4
-libavfilter_VERSION=5.16.101
+libavfilter_VERSION=5.40.101
 libavfilter_VERSION_MAJOR=5
-libavfilter_VERSION_MINOR=16
-libavformat_VERSION=56.36.100
+libavfilter_VERSION_MINOR=40
+libavformat_VERSION=56.40.101
 libavformat_VERSION_MAJOR=56
-libavformat_VERSION_MINOR=36
+libavformat_VERSION_MINOR=40
 libavresample_VERSION=2.1.0
 libavresample_VERSION_MAJOR=2
 libavresample_VERSION_MINOR=1
-libavutil_VERSION=54.27.100
+libavutil_VERSION=54.31.100
 libavutil_VERSION_MAJOR=54
-libavutil_VERSION_MINOR=27
+libavutil_VERSION_MINOR=31
 libpostproc_VERSION=53.3.100
 libpostproc_VERSION_MAJOR=53
 libpostproc_VERSION_MINOR=3
-libswresample_VERSION=1.2.100
+libswresample_VERSION=1.2.101
 libswresample_VERSION_MAJOR=1
 libswresample_VERSION_MINOR=2
 libswscale_VERSION=3.1.101
@@ -214,7 +215,9 @@ HAVE_SETEND=yes
 !HAVE_MIPSDSPR1=yes
 !HAVE_MIPSDSPR2=yes
 !HAVE_MSA=yes
-!HAVE_LOONGSON3=yes
+HAVE_LOONGSON2=yes
+HAVE_LOONGSON3=yes
+!HAVE_MMI=yes
 HAVE_ARMV5TE_EXTERNAL=yes
 !HAVE_ARMV6_EXTERNAL=yes
 !HAVE_ARMV6T2_EXTERNAL=yes
@@ -253,7 +256,9 @@ HAVE_VFP_EXTERNAL=yes
 !HAVE_MIPSDSPR1_EXTERNAL=yes
 !HAVE_MIPSDSPR2_EXTERNAL=yes
 !HAVE_MSA_EXTERNAL=yes
+!HAVE_LOONGSON2_EXTERNAL=yes
 !HAVE_LOONGSON3_EXTERNAL=yes
+!HAVE_MMI_EXTERNAL=yes
 HAVE_ARMV5TE_INLINE=yes
 !HAVE_ARMV6_INLINE=yes
 !HAVE_ARMV6T2_INLINE=yes
@@ -292,7 +297,9 @@ HAVE_ARMV5TE_INLINE=yes
 !HAVE_MIPSDSPR1_INLINE=yes
 !HAVE_MIPSDSPR2_INLINE=yes
 !HAVE_MSA_INLINE=yes
+!HAVE_LOONGSON2_INLINE=yes
 !HAVE_LOONGSON3_INLINE=yes
+!HAVE_MMI_INLINE=yes
 !HAVE_ALIGNED_STACK=yes
 !HAVE_FAST_64BIT=yes
 HAVE_FAST_CLZ=yes
@@ -330,6 +337,7 @@ HAVE_ASM_TYPES_H=yes
 !HAVE_DEV_VIDEO_BKTR_IOCTL_BT848_H=yes
 !HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H=yes
 !HAVE_DIRECT_H=yes
+HAVE_DIRENT_H=yes
 HAVE_DLFCN_H=yes
 !HAVE_D3D11_H=yes
 !HAVE_DXVA_H=yes
@@ -364,7 +372,9 @@ HAVE_ATANF=yes
 HAVE_ATAN2F=yes
 HAVE_CBRT=yes
 HAVE_CBRTF=yes
+HAVE_COPYSIGN=yes
 HAVE_COSF=yes
+HAVE_ERF=yes
 HAVE_EXP2=yes
 HAVE_EXP2F=yes
 HAVE_EXPF=yes
@@ -414,6 +424,7 @@ HAVE_ISATTY=yes
 !HAVE_JACK_PORT_GET_LATENCY_RANGE=yes
 !HAVE_KBHIT=yes
 HAVE_LOCALTIME_R=yes
+HAVE_LSTAT=yes
 !HAVE_LZO1X_999_COMPRESS=yes
 !HAVE_MACH_ABSOLUTE_TIME=yes
 !HAVE_MAPVIEWOFFILE=yes
@@ -427,6 +438,7 @@ HAVE_POSIX_MEMALIGN=yes
 !HAVE_PTHREAD_CANCEL=yes
 HAVE_SCHED_GETAFFINITY=yes
 !HAVE_SETCONSOLETEXTATTRIBUTE=yes
+!HAVE_SETCONSOLECTRLHANDLER=yes
 !HAVE_SETMODE=yes
 HAVE_SETRLIMIT=yes
 !HAVE_SLEEP=yes
@@ -463,6 +475,7 @@ 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
@@ -509,7 +522,7 @@ CONFIG_MANPAGES=yes
 CONFIG_PODPAGES=yes
 !CONFIG_TXTPAGES=yes
 CONFIG_AVIO_READING_EXAMPLE=yes
-CONFIG_AVIO_LIST_DIR_EXAMPLE=yes
+CONFIG_AVIO_DIR_CMD_EXAMPLE=yes
 CONFIG_DECODING_ENCODING_EXAMPLE=yes
 CONFIG_DEMUXING_DECODING_EXAMPLE=yes
 CONFIG_EXTRACT_MVS_EXAMPLE=yes
@@ -551,6 +564,7 @@ CONFIG_TRANSCODING_EXAMPLE=yes
 !CONFIG_LIBGSM=yes
 !CONFIG_LIBIEC61883=yes
 !CONFIG_LIBILBC=yes
+!CONFIG_LIBKVAZAAR=yes
 !CONFIG_LIBMFX=yes
 !CONFIG_LIBMODPLUG=yes
 !CONFIG_LIBMP3LAME=yes
@@ -567,6 +581,7 @@ CONFIG_TRANSCODING_EXAMPLE=yes
 !CONFIG_LIBSCHROEDINGER=yes
 !CONFIG_LIBSHINE=yes
 !CONFIG_LIBSMBCLIENT=yes
+!CONFIG_LIBSNAPPY=yes
 !CONFIG_LIBSOXR=yes
 !CONFIG_LIBSPEEX=yes
 !CONFIG_LIBSSH=yes
@@ -618,6 +633,7 @@ CONFIG_SWSCALE_ALPHA=yes
 !CONFIG_VAAPI=yes
 !CONFIG_VDA=yes
 !CONFIG_VDPAU=yes
+!CONFIG_VIDEOTOOLBOX=yes
 !CONFIG_XVMC=yes
 !CONFIG_GPL=yes
 !CONFIG_NONFREE=yes
@@ -670,8 +686,10 @@ CONFIG_EXIF=yes
 CONFIG_FAANDCT=yes
 CONFIG_FAANIDCT=yes
 CONFIG_FDCTDSP=yes
+CONFIG_FLACDSP=yes
 CONFIG_FMTCONVERT=yes
 CONFIG_FRAME_THREAD_ENCODER=yes
+CONFIG_G722DSP=yes
 !CONFIG_GCRYPT=yes
 !CONFIG_GMP=yes
 CONFIG_GOLOMB=yes
@@ -689,7 +707,9 @@ CONFIG_IDCTDSP=yes
 CONFIG_IIRFILTER=yes
 CONFIG_IMDCT15=yes
 CONFIG_INTRAX8=yes
+CONFIG_IVIDSP=yes
 CONFIG_JPEGTABLES=yes
+!CONFIG_LIBX262=yes
 !CONFIG_LGPLV3=yes
 CONFIG_LLAUDDSP=yes
 CONFIG_LLVIDDSP=yes
@@ -700,6 +720,7 @@ CONFIG_MPEGAUDIO=yes
 CONFIG_MPEGAUDIODSP=yes
 CONFIG_MPEGVIDEO=yes
 CONFIG_MPEGVIDEOENC=yes
+CONFIG_MSS34DSP=yes
 CONFIG_PIXBLOCKDSP=yes
 CONFIG_QPELDSP=yes
 !CONFIG_QSV=yes
@@ -710,16 +731,24 @@ CONFIG_RIFFDEC=yes
 CONFIG_RIFFENC=yes
 CONFIG_RTPDEC=yes
 CONFIG_RTPENC_CHAIN=yes
+CONFIG_RV34DSP=yes
 CONFIG_SINEWIN=yes
+CONFIG_SNAPPY=yes
 CONFIG_STARTCODE=yes
+CONFIG_TEXTUREDSP=yes
+!CONFIG_TEXTUREDSPENC=yes
 CONFIG_TPELDSP=yes
 CONFIG_VIDEODSP=yes
 CONFIG_VP3DSP=yes
+CONFIG_VP56DSP=yes
+CONFIG_VP8DSP=yes
 CONFIG_WMA_FREQS=yes
+CONFIG_WMV2DSP=yes
 CONFIG_AAC_ADTSTOASC_BSF=yes
 CONFIG_CHOMP_BSF=yes
 CONFIG_DUMP_EXTRADATA_BSF=yes
 CONFIG_H264_MP4TOANNEXB_BSF=yes
+CONFIG_HEVC_MP4TOANNEXB_BSF=yes
 CONFIG_IMX_DUMP_HEADER_BSF=yes
 CONFIG_MJPEG2JPEG_BSF=yes
 CONFIG_MJPEGA_DUMP_HEADER_BSF=yes
@@ -762,6 +791,7 @@ CONFIG_COMFORTNOISE_DECODER=yes
 CONFIG_CPIA_DECODER=yes
 CONFIG_CSCD_DECODER=yes
 CONFIG_CYUV_DECODER=yes
+CONFIG_DDS_DECODER=yes
 CONFIG_DFA_DECODER=yes
 CONFIG_DIRAC_DECODER=yes
 CONFIG_DNXHD_DECODER=yes
@@ -803,7 +833,9 @@ CONFIG_H264_DECODER=yes
 !CONFIG_H264_QSV_DECODER=yes
 !CONFIG_H264_VDA_DECODER=yes
 !CONFIG_H264_VDPAU_DECODER=yes
+CONFIG_HAP_DECODER=yes
 CONFIG_HEVC_DECODER=yes
+!CONFIG_HEVC_QSV_DECODER=yes
 CONFIG_HNM4_VIDEO_DECODER=yes
 CONFIG_HQ_HQA_DECODER=yes
 CONFIG_HQX_DECODER=yes
@@ -839,6 +871,7 @@ CONFIG_MPEGVIDEO_DECODER=yes
 !CONFIG_MPEG_VDPAU_DECODER=yes
 !CONFIG_MPEG1_VDPAU_DECODER=yes
 !CONFIG_MPEG2_CRYSTALHD_DECODER=yes
+!CONFIG_MPEG2_QSV_DECODER=yes
 CONFIG_MSA1_DECODER=yes
 !CONFIG_MSMPEG4_CRYSTALHD_DECODER=yes
 CONFIG_MSMPEG4V1_DECODER=yes
@@ -917,6 +950,7 @@ CONFIG_VC1_DECODER=yes
 !CONFIG_VC1_CRYSTALHD_DECODER=yes
 !CONFIG_VC1_VDPAU_DECODER=yes
 CONFIG_VC1IMAGE_DECODER=yes
+!CONFIG_VC1_QSV_DECODER=yes
 CONFIG_VCR1_DECODER=yes
 CONFIG_VMDVIDEO_DECODER=yes
 CONFIG_VMNC_DECODER=yes
@@ -951,6 +985,7 @@ CONFIG_ZEROCODEC_DECODER=yes
 CONFIG_ZLIB_DECODER=yes
 CONFIG_ZMBV_DECODER=yes
 CONFIG_AAC_DECODER=yes
+CONFIG_AAC_FIXED_DECODER=yes
 CONFIG_AAC_LATM_DECODER=yes
 CONFIG_AC3_DECODER=yes
 CONFIG_AC3_FIXED_DECODER=yes
@@ -1093,6 +1128,7 @@ CONFIG_ADPCM_SBPRO_3_DECODER=yes
 CONFIG_ADPCM_SBPRO_4_DECODER=yes
 CONFIG_ADPCM_SWF_DECODER=yes
 CONFIG_ADPCM_THP_DECODER=yes
+CONFIG_ADPCM_THP_LE_DECODER=yes
 CONFIG_ADPCM_VIMA_DECODER=yes
 CONFIG_ADPCM_XA_DECODER=yes
 CONFIG_ADPCM_YAMAHA_DECODER=yes
@@ -1140,6 +1176,7 @@ CONFIG_XSUB_DECODER=yes
 CONFIG_BINTEXT_DECODER=yes
 CONFIG_XBIN_DECODER=yes
 CONFIG_IDF_DECODER=yes
+CONFIG_AA_DEMUXER=yes
 CONFIG_AAC_DEMUXER=yes
 CONFIG_AC3_DEMUXER=yes
 CONFIG_ACT_DEMUXER=yes
@@ -1156,6 +1193,7 @@ CONFIG_APE_DEMUXER=yes
 CONFIG_APNG_DEMUXER=yes
 CONFIG_AQTITLE_DEMUXER=yes
 CONFIG_ASF_DEMUXER=yes
+CONFIG_ASF_O_DEMUXER=yes
 CONFIG_ASS_DEMUXER=yes
 CONFIG_AST_DEMUXER=yes
 CONFIG_AU_DEMUXER=yes
@@ -1169,6 +1207,7 @@ CONFIG_BINTEXT_DEMUXER=yes
 CONFIG_BINK_DEMUXER=yes
 CONFIG_BIT_DEMUXER=yes
 CONFIG_BMV_DEMUXER=yes
+CONFIG_BFSTM_DEMUXER=yes
 CONFIG_BRSTM_DEMUXER=yes
 CONFIG_BOA_DEMUXER=yes
 CONFIG_C93_DEMUXER=yes
@@ -1365,6 +1404,7 @@ CONFIG_XWMA_DEMUXER=yes
 CONFIG_YOP_DEMUXER=yes
 CONFIG_YUV4MPEGPIPE_DEMUXER=yes
 CONFIG_IMAGE_BMP_PIPE_DEMUXER=yes
+CONFIG_IMAGE_DDS_PIPE_DEMUXER=yes
 CONFIG_IMAGE_DPX_PIPE_DEMUXER=yes
 CONFIG_IMAGE_EXR_PIPE_DEMUXER=yes
 CONFIG_IMAGE_J2K_PIPE_DEMUXER=yes
@@ -1407,6 +1447,7 @@ CONFIG_GIF_ENCODER=yes
 CONFIG_H261_ENCODER=yes
 CONFIG_H263_ENCODER=yes
 CONFIG_H263P_ENCODER=yes
+!CONFIG_HAP_ENCODER=yes
 CONFIG_HUFFYUV_ENCODER=yes
 CONFIG_JPEG2000_ENCODER=yes
 CONFIG_JPEGLS_ENCODER=yes
@@ -1542,6 +1583,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_LIBWAVPACK_ENCODER=yes
 !CONFIG_LIBWEBP_ANIM_ENCODER=yes
 !CONFIG_LIBWEBP_ENCODER=yes
+!CONFIG_LIBX262_ENCODER=yes
 !CONFIG_LIBX264_ENCODER=yes
 !CONFIG_LIBX264RGB_ENCODER=yes
 !CONFIG_LIBX265_ENCODER=yes
@@ -1553,6 +1595,10 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_NVENC_ENCODER=yes
 !CONFIG_NVENC_H264_ENCODER=yes
 !CONFIG_NVENC_HEVC_ENCODER=yes
+!CONFIG_HEVC_QSV_ENCODER=yes
+!CONFIG_LIBKVAZAAR_ENCODER=yes
+!CONFIG_MPEG2_QSV_ENCODER=yes
+!CONFIG_ACROSSFADE_FILTER=yes
 !CONFIG_ADELAY_FILTER=yes
 !CONFIG_AECHO_FILTER=yes
 !CONFIG_AEVAL_FILTER=yes
@@ -1567,6 +1613,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_APERMS_FILTER=yes
 !CONFIG_APHASER_FILTER=yes
 !CONFIG_ARESAMPLE_FILTER=yes
+!CONFIG_AREVERSE_FILTER=yes
 !CONFIG_ASELECT_FILTER=yes
 !CONFIG_ASENDCMD_FILTER=yes
 !CONFIG_ASETNSAMPLES_FILTER=yes
@@ -1591,6 +1638,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_CHORUS_FILTER=yes
 !CONFIG_COMPAND_FILTER=yes
 !CONFIG_DCSHIFT_FILTER=yes
+!CONFIG_DYNAUDNORM_FILTER=yes
 !CONFIG_EARWAX_FILTER=yes
 !CONFIG_EBUR128_FILTER=yes
 !CONFIG_EQUALIZER_FILTER=yes
@@ -1602,6 +1650,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_PAN_FILTER=yes
 !CONFIG_REPLAYGAIN_FILTER=yes
 !CONFIG_RESAMPLE_FILTER=yes
+!CONFIG_SIDECHAINCOMPRESS_FILTER=yes
 !CONFIG_SILENCEDETECT_FILTER=yes
 !CONFIG_SILENCEREMOVE_FILTER=yes
 !CONFIG_TREBLE_FILTER=yes
@@ -1614,6 +1663,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_ANULLSINK_FILTER=yes
 !CONFIG_ALPHAEXTRACT_FILTER=yes
 !CONFIG_ALPHAMERGE_FILTER=yes
+!CONFIG_ATADENOISE_FILTER=yes
 !CONFIG_ASS_FILTER=yes
 !CONFIG_BBOX_FILTER=yes
 !CONFIG_BLACKDETECT_FILTER=yes
@@ -1623,6 +1673,7 @@ CONFIG_XSUB_ENCODER=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_COPY_FILTER=yes
@@ -1631,17 +1682,22 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_CROPDETECT_FILTER=yes
 !CONFIG_CURVES_FILTER=yes
 !CONFIG_DCTDNOIZ_FILTER=yes
+!CONFIG_DEBAND_FILTER=yes
 !CONFIG_DECIMATE_FILTER=yes
+!CONFIG_DEFLATE_FILTER=yes
 !CONFIG_DEJUDDER_FILTER=yes
 !CONFIG_DELOGO_FILTER=yes
 !CONFIG_DESHAKE_FILTER=yes
 !CONFIG_DETELECINE_FILTER=yes
+!CONFIG_DILATION_FILTER=yes
 !CONFIG_DRAWBOX_FILTER=yes
+!CONFIG_DRAWGRAPH_FILTER=yes
 !CONFIG_DRAWGRID_FILTER=yes
 !CONFIG_DRAWTEXT_FILTER=yes
 !CONFIG_EDGEDETECT_FILTER=yes
 !CONFIG_ELBG_FILTER=yes
 !CONFIG_EQ_FILTER=yes
+!CONFIG_EROSION_FILTER=yes
 !CONFIG_EXTRACTPLANES_FILTER=yes
 !CONFIG_FADE_FILTER=yes
 !CONFIG_FFTFILT_FILTER=yes
@@ -1652,6 +1708,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_FORMAT_FILTER=yes
 !CONFIG_FPS_FILTER=yes
 !CONFIG_FRAMEPACK_FILTER=yes
+!CONFIG_FRAMERATE_FILTER=yes
 !CONFIG_FRAMESTEP_FILTER=yes
 !CONFIG_FREI0R_FILTER=yes
 !CONFIG_FSPP_FILTER=yes
@@ -1663,9 +1720,11 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_HISTOGRAM_FILTER=yes
 !CONFIG_HQDN3D_FILTER=yes
 !CONFIG_HQX_FILTER=yes
+!CONFIG_HSTACK_FILTER=yes
 !CONFIG_HUE_FILTER=yes
 !CONFIG_IDET_FILTER=yes
 !CONFIG_IL_FILTER=yes
+!CONFIG_INFLATE_FILTER=yes
 !CONFIG_INTERLACE_FILTER=yes
 !CONFIG_INTERLEAVE_FILTER=yes
 !CONFIG_KERNDEINT_FILTER=yes
@@ -1696,11 +1755,15 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_PSNR_FILTER=yes
 !CONFIG_PULLUP_FILTER=yes
 !CONFIG_QP_FILTER=yes
+!CONFIG_RANDOM_FILTER=yes
+!CONFIG_REMOVEGRAIN_FILTER=yes
 !CONFIG_REMOVELOGO_FILTER=yes
 !CONFIG_REPEATFIELDS_FILTER=yes
+!CONFIG_REVERSE_FILTER=yes
 !CONFIG_ROTATE_FILTER=yes
 !CONFIG_SAB_FILTER=yes
 !CONFIG_SCALE_FILTER=yes
+!CONFIG_SCALE2REF_FILTER=yes
 !CONFIG_SELECT_FILTER=yes
 !CONFIG_SENDCMD_FILTER=yes
 !CONFIG_SEPARATEFIELDS_FILTER=yes
@@ -1716,6 +1779,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_SMARTBLUR_FILTER=yes
 !CONFIG_SPLIT_FILTER=yes
 !CONFIG_SPP_FILTER=yes
+!CONFIG_SSIM_FILTER=yes
 !CONFIG_STEREO3D_FILTER=yes
 !CONFIG_SUBTITLES_FILTER=yes
 !CONFIG_SUPER2XSAI_FILTER=yes
@@ -1729,15 +1793,20 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_TRIM_FILTER=yes
 !CONFIG_UNSHARP_FILTER=yes
 !CONFIG_USPP_FILTER=yes
+!CONFIG_VECTORSCOPE_FILTER=yes
 !CONFIG_VFLIP_FILTER=yes
 !CONFIG_VIDSTABDETECT_FILTER=yes
 !CONFIG_VIDSTABTRANSFORM_FILTER=yes
 !CONFIG_VIGNETTE_FILTER=yes
+!CONFIG_VSTACK_FILTER=yes
 !CONFIG_W3FDIF_FILTER=yes
+!CONFIG_WAVEFORM_FILTER=yes
 !CONFIG_XBR_FILTER=yes
 !CONFIG_YADIF_FILTER=yes
 !CONFIG_ZMQ_FILTER=yes
 !CONFIG_ZOOMPAN_FILTER=yes
+!CONFIG_ALLRGB_FILTER=yes
+!CONFIG_ALLYUV_FILTER=yes
 !CONFIG_CELLAUTO_FILTER=yes
 !CONFIG_COLOR_FILTER=yes
 !CONFIG_FREI0R_SRC_FILTER=yes
@@ -1751,16 +1820,21 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_SMPTEHDBARS_FILTER=yes
 !CONFIG_TESTSRC_FILTER=yes
 !CONFIG_NULLSINK_FILTER=yes
+!CONFIG_ADRAWGRAPH_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_SHOWVOLUME_FILTER=yes
 !CONFIG_SHOWWAVES_FILTER=yes
 !CONFIG_SHOWWAVESPIC_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
 !CONFIG_H264_MMAL_HWACCEL=yes
@@ -1769,21 +1843,30 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_H264_VDA_HWACCEL=yes
 !CONFIG_H264_VDA_OLD_HWACCEL=yes
 !CONFIG_H264_VDPAU_HWACCEL=yes
+!CONFIG_H264_VIDEOTOOLBOX_HWACCEL=yes
 !CONFIG_HEVC_D3D11VA_HWACCEL=yes
 !CONFIG_HEVC_DXVA2_HWACCEL=yes
+!CONFIG_HEVC_QSV_HWACCEL=yes
+!CONFIG_HEVC_VAAPI_HWACCEL=yes
+!CONFIG_HEVC_VDPAU_HWACCEL=yes
 !CONFIG_MPEG1_XVMC_HWACCEL=yes
 !CONFIG_MPEG1_VDPAU_HWACCEL=yes
+!CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL=yes
 !CONFIG_MPEG2_XVMC_HWACCEL=yes
 !CONFIG_MPEG2_D3D11VA_HWACCEL=yes
 !CONFIG_MPEG2_DXVA2_HWACCEL=yes
+!CONFIG_MPEG2_QSV_HWACCEL=yes
 !CONFIG_MPEG2_VAAPI_HWACCEL=yes
 !CONFIG_MPEG2_VDPAU_HWACCEL=yes
+!CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL=yes
 !CONFIG_MPEG4_VAAPI_HWACCEL=yes
 !CONFIG_MPEG4_VDPAU_HWACCEL=yes
+!CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL=yes
 !CONFIG_VC1_D3D11VA_HWACCEL=yes
 !CONFIG_VC1_DXVA2_HWACCEL=yes
 !CONFIG_VC1_VAAPI_HWACCEL=yes
 !CONFIG_VC1_VDPAU_HWACCEL=yes
+!CONFIG_VC1_QSV_HWACCEL=yes
 !CONFIG_WMV3_D3D11VA_HWACCEL=yes
 !CONFIG_WMV3_DXVA2_HWACCEL=yes
 !CONFIG_WMV3_VAAPI_HWACCEL=yes
@@ -1980,6 +2063,7 @@ CONFIG_DVBSUB_PARSER=yes
 CONFIG_DVDSUB_PARSER=yes
 CONFIG_DVD_NAV_PARSER=yes
 CONFIG_FLAC_PARSER=yes
+CONFIG_G729_PARSER=yes
 CONFIG_GSM_PARSER=yes
 CONFIG_H261_PARSER=yes
 CONFIG_H263_PARSER=yes
@@ -2001,6 +2085,7 @@ CONFIG_VORBIS_PARSER=yes
 CONFIG_VP3_PARSER=yes
 CONFIG_VP8_PARSER=yes
 CONFIG_VP9_PARSER=yes
+CONFIG_ASYNC_PROTOCOL=yes
 !CONFIG_BLURAY_PROTOCOL=yes
 CONFIG_CACHE_PROTOCOL=yes
 CONFIG_CONCAT_PROTOCOL=yes
diff --git a/android/config-armv7-a-neon.mak b/android/config-armv7-a-neon.mak
index 0d804cc0a4..74b3953fa8 100644
--- a/android/config-armv7-a-neon.mak
+++ b/android/config-armv7-a-neon.mak
@@ -1,7 +1,7 @@
 # Automatically generated by configure - do not modify!
 ifndef FFMPEG_CONFIG_MAK
 FFMPEG_CONFIG_MAK=1
-FFMPEG_CONFIGURATION=--arch=arm --cpu=armv7-a --build_suffix= --cross-prefix=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8/bin/arm-linux-androideabi- --enable-cross-compile --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-arm --target-os=linux --disable-static --enable-shared --enable-optimizations --disable-doc --disable-symver --disable-ffmpeg --disable-ffplay --disable-ffprobe --disable-ffserver --disable-avdevice --disable-devices --disable-filters --disable-demuxer=srt --disable-demuxer=microdvd --disable-demuxer=jacosub --disable-demuxer=sami --disable-demuxer=realtext --disable-demuxer=dts --disable-demuxer=subviewer --disable-demuxer=subviewer1 --disable-demuxer=pjs --disable-demuxer=vplayer --disable-demuxer=mpl2 --disable-decoder=ass --disable-decoder=srt --disable-decoder=subrip --disable-decoder=microdvd --disable-decoder=jacosub --disable-decoder=sami --disable-decoder=realtext --disable-decoder=movtext --disable-decoder=subviewer --disable-decoder=subviewer1 --disable-decoder=pjs --disable-decoder=vplayer --disable-decoder=mpl2 --enable-zlib --enable-pic --disable-debug
+FFMPEG_CONFIGURATION=--arch=arm --cpu=armv7-a --build_suffix= --cross-prefix=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi- --enable-cross-compile --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-arm --target-os=linux --disable-static --enable-shared --enable-optimizations --disable-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
 prefix=/usr/local
 LIBDIR=$(DESTDIR)${prefix}/lib
 SHLIBDIR=$(DESTDIR)${prefix}/lib
@@ -15,24 +15,24 @@ SRC_PATH=.
 ifndef MAIN_MAKEFILE
 SRC_PATH:=$(SRC_PATH:.%=..%)
 endif
-CC_IDENT=gcc 4.8 (GCC)
+CC_IDENT=gcc 4.9.x-google (GCC) 20140827 (prerelease)
 ARCH=arm
 INTRINSICS=none
-CC=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8/bin/arm-linux-androideabi-gcc
-CXX=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8/bin/arm-linux-androideabi-g++
-AS=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8/bin/arm-linux-androideabi-gcc
-LD=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8/bin/arm-linux-androideabi-gcc
-DEPCC=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8/bin/arm-linux-androideabi-gcc
+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
+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)
-DEPAS=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8/bin/arm-linux-androideabi-gcc
+DEPAS=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-gcc
 DEPASFLAGS= $(CPPFLAGS)
 YASM=yasm
 DEPYASM=yasm
-AR=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8/bin/arm-linux-androideabi-ar
+AR=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-ar
 ARFLAGS=rcD
 AR_O=$@
-RANLIB=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8/bin/arm-linux-androideabi-ranlib -D
-STRIP=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8/bin/arm-linux-androideabi-strip
+RANLIB=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-ranlib -D
+STRIP=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-strip
 CP=cp -p
 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
@@ -50,11 +50,12 @@ LD_O=-o $@
 LD_LIB=-l%
 LD_PATH=-L
 DLLTOOL=
-WINDRES=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8/bin/arm-linux-androideabi-windres
-DEPWINDRES=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8/bin/arm-linux-androideabi-gcc
+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
 LDEXEFLAGS=
+LDLIBFLAGS=
 SHFLAGS=-shared -Wl,-soname,$$(@F) -Wl,-Bsymbolic -Wl,--version-script,$(SUBDIR)lib$(NAME).ver
 ASMSTRIPFLAGS= -wN '..@*'
 YASMFLAGS=
@@ -68,13 +69,13 @@ SLIBPREF=lib
 SLIBSUF=.so
 EXESUF=
 EXTRA_VERSION=
-CCDEP=
+CCDEP=$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< | sed -e "/^\#.*/d" -e "s,^[[:space:]]*$(*F)\\.o,$(@D)/$(*F).o," > $(@:.o=.d)
 CXXDEP=
-CCDEP_FLAGS=
-ASDEP=
-ASDEP_FLAGS=
-CC_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@
-AS_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@
+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=
 HOSTCC=gcc
 HOSTLD=gcc
 HOSTCFLAGS=  -std=c99 -Wall -O3
@@ -84,9 +85,9 @@ HOSTLDFLAGS=
 HOSTLIBS=-lm
 DEPHOSTCC=gcc
 DEPHOSTCCFLAGS= $(HOSTCCFLAGS)
-HOSTCCDEP=
-HOSTCCDEP_FLAGS=
-HOSTCC_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@
+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=
 HOSTCC_C=-c
 HOSTCC_O=-o $@
 HOSTLD_O=-o $@
@@ -112,28 +113,28 @@ SLIB_INSTALL_EXTRA_LIB=
 SLIB_INSTALL_EXTRA_SHLIB=
 SAMPLES:=$(FATE_SAMPLES)
 NOREDZONE_FLAGS=
-libavcodec_VERSION=56.41.100
+libavcodec_VERSION=56.60.100
 libavcodec_VERSION_MAJOR=56
-libavcodec_VERSION_MINOR=41
+libavcodec_VERSION_MINOR=60
 libavdevice_VERSION=56.4.100
 libavdevice_VERSION_MAJOR=56
 libavdevice_VERSION_MINOR=4
-libavfilter_VERSION=5.16.101
+libavfilter_VERSION=5.40.101
 libavfilter_VERSION_MAJOR=5
-libavfilter_VERSION_MINOR=16
-libavformat_VERSION=56.36.100
+libavfilter_VERSION_MINOR=40
+libavformat_VERSION=56.40.101
 libavformat_VERSION_MAJOR=56
-libavformat_VERSION_MINOR=36
+libavformat_VERSION_MINOR=40
 libavresample_VERSION=2.1.0
 libavresample_VERSION_MAJOR=2
 libavresample_VERSION_MINOR=1
-libavutil_VERSION=54.27.100
+libavutil_VERSION=54.31.100
 libavutil_VERSION_MAJOR=54
-libavutil_VERSION_MINOR=27
+libavutil_VERSION_MINOR=31
 libpostproc_VERSION=53.3.100
 libpostproc_VERSION_MAJOR=53
 libpostproc_VERSION_MINOR=3
-libswresample_VERSION=1.2.100
+libswresample_VERSION=1.2.101
 libswresample_VERSION_MAJOR=1
 libswresample_VERSION_MINOR=2
 libswscale_VERSION=3.1.101
@@ -214,7 +215,9 @@ HAVE_SETEND=yes
 !HAVE_MIPSDSPR1=yes
 !HAVE_MIPSDSPR2=yes
 !HAVE_MSA=yes
-!HAVE_LOONGSON3=yes
+HAVE_LOONGSON2=yes
+HAVE_LOONGSON3=yes
+!HAVE_MMI=yes
 HAVE_ARMV5TE_EXTERNAL=yes
 HAVE_ARMV6_EXTERNAL=yes
 HAVE_ARMV6T2_EXTERNAL=yes
@@ -253,7 +256,9 @@ HAVE_SETEND_EXTERNAL=yes
 !HAVE_MIPSDSPR1_EXTERNAL=yes
 !HAVE_MIPSDSPR2_EXTERNAL=yes
 !HAVE_MSA_EXTERNAL=yes
+!HAVE_LOONGSON2_EXTERNAL=yes
 !HAVE_LOONGSON3_EXTERNAL=yes
+!HAVE_MMI_EXTERNAL=yes
 HAVE_ARMV5TE_INLINE=yes
 HAVE_ARMV6_INLINE=yes
 HAVE_ARMV6T2_INLINE=yes
@@ -292,7 +297,9 @@ HAVE_SETEND_INLINE=yes
 !HAVE_MIPSDSPR1_INLINE=yes
 !HAVE_MIPSDSPR2_INLINE=yes
 !HAVE_MSA_INLINE=yes
+!HAVE_LOONGSON2_INLINE=yes
 !HAVE_LOONGSON3_INLINE=yes
+!HAVE_MMI_INLINE=yes
 !HAVE_ALIGNED_STACK=yes
 !HAVE_FAST_64BIT=yes
 HAVE_FAST_CLZ=yes
@@ -330,6 +337,7 @@ HAVE_ASM_TYPES_H=yes
 !HAVE_DEV_VIDEO_BKTR_IOCTL_BT848_H=yes
 !HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H=yes
 !HAVE_DIRECT_H=yes
+HAVE_DIRENT_H=yes
 HAVE_DLFCN_H=yes
 !HAVE_D3D11_H=yes
 !HAVE_DXVA_H=yes
@@ -364,7 +372,9 @@ HAVE_ATANF=yes
 HAVE_ATAN2F=yes
 HAVE_CBRT=yes
 HAVE_CBRTF=yes
+HAVE_COPYSIGN=yes
 HAVE_COSF=yes
+HAVE_ERF=yes
 HAVE_EXP2=yes
 HAVE_EXP2F=yes
 HAVE_EXPF=yes
@@ -414,6 +424,7 @@ HAVE_ISATTY=yes
 !HAVE_JACK_PORT_GET_LATENCY_RANGE=yes
 !HAVE_KBHIT=yes
 HAVE_LOCALTIME_R=yes
+HAVE_LSTAT=yes
 !HAVE_LZO1X_999_COMPRESS=yes
 !HAVE_MACH_ABSOLUTE_TIME=yes
 !HAVE_MAPVIEWOFFILE=yes
@@ -427,6 +438,7 @@ HAVE_POSIX_MEMALIGN=yes
 !HAVE_PTHREAD_CANCEL=yes
 HAVE_SCHED_GETAFFINITY=yes
 !HAVE_SETCONSOLETEXTATTRIBUTE=yes
+!HAVE_SETCONSOLECTRLHANDLER=yes
 !HAVE_SETMODE=yes
 HAVE_SETRLIMIT=yes
 !HAVE_SLEEP=yes
@@ -463,6 +475,7 @@ 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
@@ -509,7 +522,7 @@ CONFIG_MANPAGES=yes
 CONFIG_PODPAGES=yes
 !CONFIG_TXTPAGES=yes
 CONFIG_AVIO_READING_EXAMPLE=yes
-CONFIG_AVIO_LIST_DIR_EXAMPLE=yes
+CONFIG_AVIO_DIR_CMD_EXAMPLE=yes
 CONFIG_DECODING_ENCODING_EXAMPLE=yes
 CONFIG_DEMUXING_DECODING_EXAMPLE=yes
 CONFIG_EXTRACT_MVS_EXAMPLE=yes
@@ -551,6 +564,7 @@ CONFIG_TRANSCODING_EXAMPLE=yes
 !CONFIG_LIBGSM=yes
 !CONFIG_LIBIEC61883=yes
 !CONFIG_LIBILBC=yes
+!CONFIG_LIBKVAZAAR=yes
 !CONFIG_LIBMFX=yes
 !CONFIG_LIBMODPLUG=yes
 !CONFIG_LIBMP3LAME=yes
@@ -567,6 +581,7 @@ CONFIG_TRANSCODING_EXAMPLE=yes
 !CONFIG_LIBSCHROEDINGER=yes
 !CONFIG_LIBSHINE=yes
 !CONFIG_LIBSMBCLIENT=yes
+!CONFIG_LIBSNAPPY=yes
 !CONFIG_LIBSOXR=yes
 !CONFIG_LIBSPEEX=yes
 !CONFIG_LIBSSH=yes
@@ -618,6 +633,7 @@ CONFIG_SWSCALE_ALPHA=yes
 !CONFIG_VAAPI=yes
 !CONFIG_VDA=yes
 !CONFIG_VDPAU=yes
+!CONFIG_VIDEOTOOLBOX=yes
 !CONFIG_XVMC=yes
 !CONFIG_GPL=yes
 !CONFIG_NONFREE=yes
@@ -670,8 +686,10 @@ CONFIG_EXIF=yes
 CONFIG_FAANDCT=yes
 CONFIG_FAANIDCT=yes
 CONFIG_FDCTDSP=yes
+CONFIG_FLACDSP=yes
 CONFIG_FMTCONVERT=yes
 CONFIG_FRAME_THREAD_ENCODER=yes
+CONFIG_G722DSP=yes
 !CONFIG_GCRYPT=yes
 !CONFIG_GMP=yes
 CONFIG_GOLOMB=yes
@@ -689,7 +707,9 @@ CONFIG_IDCTDSP=yes
 CONFIG_IIRFILTER=yes
 CONFIG_IMDCT15=yes
 CONFIG_INTRAX8=yes
+CONFIG_IVIDSP=yes
 CONFIG_JPEGTABLES=yes
+!CONFIG_LIBX262=yes
 !CONFIG_LGPLV3=yes
 CONFIG_LLAUDDSP=yes
 CONFIG_LLVIDDSP=yes
@@ -700,6 +720,7 @@ CONFIG_MPEGAUDIO=yes
 CONFIG_MPEGAUDIODSP=yes
 CONFIG_MPEGVIDEO=yes
 CONFIG_MPEGVIDEOENC=yes
+CONFIG_MSS34DSP=yes
 CONFIG_PIXBLOCKDSP=yes
 CONFIG_QPELDSP=yes
 !CONFIG_QSV=yes
@@ -710,16 +731,24 @@ CONFIG_RIFFDEC=yes
 CONFIG_RIFFENC=yes
 CONFIG_RTPDEC=yes
 CONFIG_RTPENC_CHAIN=yes
+CONFIG_RV34DSP=yes
 CONFIG_SINEWIN=yes
+CONFIG_SNAPPY=yes
 CONFIG_STARTCODE=yes
+CONFIG_TEXTUREDSP=yes
+!CONFIG_TEXTUREDSPENC=yes
 CONFIG_TPELDSP=yes
 CONFIG_VIDEODSP=yes
 CONFIG_VP3DSP=yes
+CONFIG_VP56DSP=yes
+CONFIG_VP8DSP=yes
 CONFIG_WMA_FREQS=yes
+CONFIG_WMV2DSP=yes
 CONFIG_AAC_ADTSTOASC_BSF=yes
 CONFIG_CHOMP_BSF=yes
 CONFIG_DUMP_EXTRADATA_BSF=yes
 CONFIG_H264_MP4TOANNEXB_BSF=yes
+CONFIG_HEVC_MP4TOANNEXB_BSF=yes
 CONFIG_IMX_DUMP_HEADER_BSF=yes
 CONFIG_MJPEG2JPEG_BSF=yes
 CONFIG_MJPEGA_DUMP_HEADER_BSF=yes
@@ -762,6 +791,7 @@ CONFIG_COMFORTNOISE_DECODER=yes
 CONFIG_CPIA_DECODER=yes
 CONFIG_CSCD_DECODER=yes
 CONFIG_CYUV_DECODER=yes
+CONFIG_DDS_DECODER=yes
 CONFIG_DFA_DECODER=yes
 CONFIG_DIRAC_DECODER=yes
 CONFIG_DNXHD_DECODER=yes
@@ -803,7 +833,9 @@ CONFIG_H264_DECODER=yes
 !CONFIG_H264_QSV_DECODER=yes
 !CONFIG_H264_VDA_DECODER=yes
 !CONFIG_H264_VDPAU_DECODER=yes
+CONFIG_HAP_DECODER=yes
 CONFIG_HEVC_DECODER=yes
+!CONFIG_HEVC_QSV_DECODER=yes
 CONFIG_HNM4_VIDEO_DECODER=yes
 CONFIG_HQ_HQA_DECODER=yes
 CONFIG_HQX_DECODER=yes
@@ -839,6 +871,7 @@ CONFIG_MPEGVIDEO_DECODER=yes
 !CONFIG_MPEG_VDPAU_DECODER=yes
 !CONFIG_MPEG1_VDPAU_DECODER=yes
 !CONFIG_MPEG2_CRYSTALHD_DECODER=yes
+!CONFIG_MPEG2_QSV_DECODER=yes
 CONFIG_MSA1_DECODER=yes
 !CONFIG_MSMPEG4_CRYSTALHD_DECODER=yes
 CONFIG_MSMPEG4V1_DECODER=yes
@@ -917,6 +950,7 @@ CONFIG_VC1_DECODER=yes
 !CONFIG_VC1_CRYSTALHD_DECODER=yes
 !CONFIG_VC1_VDPAU_DECODER=yes
 CONFIG_VC1IMAGE_DECODER=yes
+!CONFIG_VC1_QSV_DECODER=yes
 CONFIG_VCR1_DECODER=yes
 CONFIG_VMDVIDEO_DECODER=yes
 CONFIG_VMNC_DECODER=yes
@@ -951,6 +985,7 @@ CONFIG_ZEROCODEC_DECODER=yes
 CONFIG_ZLIB_DECODER=yes
 CONFIG_ZMBV_DECODER=yes
 CONFIG_AAC_DECODER=yes
+CONFIG_AAC_FIXED_DECODER=yes
 CONFIG_AAC_LATM_DECODER=yes
 CONFIG_AC3_DECODER=yes
 CONFIG_AC3_FIXED_DECODER=yes
@@ -1093,6 +1128,7 @@ CONFIG_ADPCM_SBPRO_3_DECODER=yes
 CONFIG_ADPCM_SBPRO_4_DECODER=yes
 CONFIG_ADPCM_SWF_DECODER=yes
 CONFIG_ADPCM_THP_DECODER=yes
+CONFIG_ADPCM_THP_LE_DECODER=yes
 CONFIG_ADPCM_VIMA_DECODER=yes
 CONFIG_ADPCM_XA_DECODER=yes
 CONFIG_ADPCM_YAMAHA_DECODER=yes
@@ -1140,6 +1176,7 @@ CONFIG_XSUB_DECODER=yes
 CONFIG_BINTEXT_DECODER=yes
 CONFIG_XBIN_DECODER=yes
 CONFIG_IDF_DECODER=yes
+CONFIG_AA_DEMUXER=yes
 CONFIG_AAC_DEMUXER=yes
 CONFIG_AC3_DEMUXER=yes
 CONFIG_ACT_DEMUXER=yes
@@ -1156,6 +1193,7 @@ CONFIG_APE_DEMUXER=yes
 CONFIG_APNG_DEMUXER=yes
 CONFIG_AQTITLE_DEMUXER=yes
 CONFIG_ASF_DEMUXER=yes
+CONFIG_ASF_O_DEMUXER=yes
 CONFIG_ASS_DEMUXER=yes
 CONFIG_AST_DEMUXER=yes
 CONFIG_AU_DEMUXER=yes
@@ -1169,6 +1207,7 @@ CONFIG_BINTEXT_DEMUXER=yes
 CONFIG_BINK_DEMUXER=yes
 CONFIG_BIT_DEMUXER=yes
 CONFIG_BMV_DEMUXER=yes
+CONFIG_BFSTM_DEMUXER=yes
 CONFIG_BRSTM_DEMUXER=yes
 CONFIG_BOA_DEMUXER=yes
 CONFIG_C93_DEMUXER=yes
@@ -1365,6 +1404,7 @@ CONFIG_XWMA_DEMUXER=yes
 CONFIG_YOP_DEMUXER=yes
 CONFIG_YUV4MPEGPIPE_DEMUXER=yes
 CONFIG_IMAGE_BMP_PIPE_DEMUXER=yes
+CONFIG_IMAGE_DDS_PIPE_DEMUXER=yes
 CONFIG_IMAGE_DPX_PIPE_DEMUXER=yes
 CONFIG_IMAGE_EXR_PIPE_DEMUXER=yes
 CONFIG_IMAGE_J2K_PIPE_DEMUXER=yes
@@ -1407,6 +1447,7 @@ CONFIG_GIF_ENCODER=yes
 CONFIG_H261_ENCODER=yes
 CONFIG_H263_ENCODER=yes
 CONFIG_H263P_ENCODER=yes
+!CONFIG_HAP_ENCODER=yes
 CONFIG_HUFFYUV_ENCODER=yes
 CONFIG_JPEG2000_ENCODER=yes
 CONFIG_JPEGLS_ENCODER=yes
@@ -1542,6 +1583,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_LIBWAVPACK_ENCODER=yes
 !CONFIG_LIBWEBP_ANIM_ENCODER=yes
 !CONFIG_LIBWEBP_ENCODER=yes
+!CONFIG_LIBX262_ENCODER=yes
 !CONFIG_LIBX264_ENCODER=yes
 !CONFIG_LIBX264RGB_ENCODER=yes
 !CONFIG_LIBX265_ENCODER=yes
@@ -1553,6 +1595,10 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_NVENC_ENCODER=yes
 !CONFIG_NVENC_H264_ENCODER=yes
 !CONFIG_NVENC_HEVC_ENCODER=yes
+!CONFIG_HEVC_QSV_ENCODER=yes
+!CONFIG_LIBKVAZAAR_ENCODER=yes
+!CONFIG_MPEG2_QSV_ENCODER=yes
+!CONFIG_ACROSSFADE_FILTER=yes
 !CONFIG_ADELAY_FILTER=yes
 !CONFIG_AECHO_FILTER=yes
 !CONFIG_AEVAL_FILTER=yes
@@ -1567,6 +1613,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_APERMS_FILTER=yes
 !CONFIG_APHASER_FILTER=yes
 !CONFIG_ARESAMPLE_FILTER=yes
+!CONFIG_AREVERSE_FILTER=yes
 !CONFIG_ASELECT_FILTER=yes
 !CONFIG_ASENDCMD_FILTER=yes
 !CONFIG_ASETNSAMPLES_FILTER=yes
@@ -1591,6 +1638,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_CHORUS_FILTER=yes
 !CONFIG_COMPAND_FILTER=yes
 !CONFIG_DCSHIFT_FILTER=yes
+!CONFIG_DYNAUDNORM_FILTER=yes
 !CONFIG_EARWAX_FILTER=yes
 !CONFIG_EBUR128_FILTER=yes
 !CONFIG_EQUALIZER_FILTER=yes
@@ -1602,6 +1650,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_PAN_FILTER=yes
 !CONFIG_REPLAYGAIN_FILTER=yes
 !CONFIG_RESAMPLE_FILTER=yes
+!CONFIG_SIDECHAINCOMPRESS_FILTER=yes
 !CONFIG_SILENCEDETECT_FILTER=yes
 !CONFIG_SILENCEREMOVE_FILTER=yes
 !CONFIG_TREBLE_FILTER=yes
@@ -1614,6 +1663,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_ANULLSINK_FILTER=yes
 !CONFIG_ALPHAEXTRACT_FILTER=yes
 !CONFIG_ALPHAMERGE_FILTER=yes
+!CONFIG_ATADENOISE_FILTER=yes
 !CONFIG_ASS_FILTER=yes
 !CONFIG_BBOX_FILTER=yes
 !CONFIG_BLACKDETECT_FILTER=yes
@@ -1623,6 +1673,7 @@ CONFIG_XSUB_ENCODER=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_COPY_FILTER=yes
@@ -1631,17 +1682,22 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_CROPDETECT_FILTER=yes
 !CONFIG_CURVES_FILTER=yes
 !CONFIG_DCTDNOIZ_FILTER=yes
+!CONFIG_DEBAND_FILTER=yes
 !CONFIG_DECIMATE_FILTER=yes
+!CONFIG_DEFLATE_FILTER=yes
 !CONFIG_DEJUDDER_FILTER=yes
 !CONFIG_DELOGO_FILTER=yes
 !CONFIG_DESHAKE_FILTER=yes
 !CONFIG_DETELECINE_FILTER=yes
+!CONFIG_DILATION_FILTER=yes
 !CONFIG_DRAWBOX_FILTER=yes
+!CONFIG_DRAWGRAPH_FILTER=yes
 !CONFIG_DRAWGRID_FILTER=yes
 !CONFIG_DRAWTEXT_FILTER=yes
 !CONFIG_EDGEDETECT_FILTER=yes
 !CONFIG_ELBG_FILTER=yes
 !CONFIG_EQ_FILTER=yes
+!CONFIG_EROSION_FILTER=yes
 !CONFIG_EXTRACTPLANES_FILTER=yes
 !CONFIG_FADE_FILTER=yes
 !CONFIG_FFTFILT_FILTER=yes
@@ -1652,6 +1708,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_FORMAT_FILTER=yes
 !CONFIG_FPS_FILTER=yes
 !CONFIG_FRAMEPACK_FILTER=yes
+!CONFIG_FRAMERATE_FILTER=yes
 !CONFIG_FRAMESTEP_FILTER=yes
 !CONFIG_FREI0R_FILTER=yes
 !CONFIG_FSPP_FILTER=yes
@@ -1663,9 +1720,11 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_HISTOGRAM_FILTER=yes
 !CONFIG_HQDN3D_FILTER=yes
 !CONFIG_HQX_FILTER=yes
+!CONFIG_HSTACK_FILTER=yes
 !CONFIG_HUE_FILTER=yes
 !CONFIG_IDET_FILTER=yes
 !CONFIG_IL_FILTER=yes
+!CONFIG_INFLATE_FILTER=yes
 !CONFIG_INTERLACE_FILTER=yes
 !CONFIG_INTERLEAVE_FILTER=yes
 !CONFIG_KERNDEINT_FILTER=yes
@@ -1696,11 +1755,15 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_PSNR_FILTER=yes
 !CONFIG_PULLUP_FILTER=yes
 !CONFIG_QP_FILTER=yes
+!CONFIG_RANDOM_FILTER=yes
+!CONFIG_REMOVEGRAIN_FILTER=yes
 !CONFIG_REMOVELOGO_FILTER=yes
 !CONFIG_REPEATFIELDS_FILTER=yes
+!CONFIG_REVERSE_FILTER=yes
 !CONFIG_ROTATE_FILTER=yes
 !CONFIG_SAB_FILTER=yes
 !CONFIG_SCALE_FILTER=yes
+!CONFIG_SCALE2REF_FILTER=yes
 !CONFIG_SELECT_FILTER=yes
 !CONFIG_SENDCMD_FILTER=yes
 !CONFIG_SEPARATEFIELDS_FILTER=yes
@@ -1716,6 +1779,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_SMARTBLUR_FILTER=yes
 !CONFIG_SPLIT_FILTER=yes
 !CONFIG_SPP_FILTER=yes
+!CONFIG_SSIM_FILTER=yes
 !CONFIG_STEREO3D_FILTER=yes
 !CONFIG_SUBTITLES_FILTER=yes
 !CONFIG_SUPER2XSAI_FILTER=yes
@@ -1729,15 +1793,20 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_TRIM_FILTER=yes
 !CONFIG_UNSHARP_FILTER=yes
 !CONFIG_USPP_FILTER=yes
+!CONFIG_VECTORSCOPE_FILTER=yes
 !CONFIG_VFLIP_FILTER=yes
 !CONFIG_VIDSTABDETECT_FILTER=yes
 !CONFIG_VIDSTABTRANSFORM_FILTER=yes
 !CONFIG_VIGNETTE_FILTER=yes
+!CONFIG_VSTACK_FILTER=yes
 !CONFIG_W3FDIF_FILTER=yes
+!CONFIG_WAVEFORM_FILTER=yes
 !CONFIG_XBR_FILTER=yes
 !CONFIG_YADIF_FILTER=yes
 !CONFIG_ZMQ_FILTER=yes
 !CONFIG_ZOOMPAN_FILTER=yes
+!CONFIG_ALLRGB_FILTER=yes
+!CONFIG_ALLYUV_FILTER=yes
 !CONFIG_CELLAUTO_FILTER=yes
 !CONFIG_COLOR_FILTER=yes
 !CONFIG_FREI0R_SRC_FILTER=yes
@@ -1751,16 +1820,21 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_SMPTEHDBARS_FILTER=yes
 !CONFIG_TESTSRC_FILTER=yes
 !CONFIG_NULLSINK_FILTER=yes
+!CONFIG_ADRAWGRAPH_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_SHOWVOLUME_FILTER=yes
 !CONFIG_SHOWWAVES_FILTER=yes
 !CONFIG_SHOWWAVESPIC_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
 !CONFIG_H264_MMAL_HWACCEL=yes
@@ -1769,21 +1843,30 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_H264_VDA_HWACCEL=yes
 !CONFIG_H264_VDA_OLD_HWACCEL=yes
 !CONFIG_H264_VDPAU_HWACCEL=yes
+!CONFIG_H264_VIDEOTOOLBOX_HWACCEL=yes
 !CONFIG_HEVC_D3D11VA_HWACCEL=yes
 !CONFIG_HEVC_DXVA2_HWACCEL=yes
+!CONFIG_HEVC_QSV_HWACCEL=yes
+!CONFIG_HEVC_VAAPI_HWACCEL=yes
+!CONFIG_HEVC_VDPAU_HWACCEL=yes
 !CONFIG_MPEG1_XVMC_HWACCEL=yes
 !CONFIG_MPEG1_VDPAU_HWACCEL=yes
+!CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL=yes
 !CONFIG_MPEG2_XVMC_HWACCEL=yes
 !CONFIG_MPEG2_D3D11VA_HWACCEL=yes
 !CONFIG_MPEG2_DXVA2_HWACCEL=yes
+!CONFIG_MPEG2_QSV_HWACCEL=yes
 !CONFIG_MPEG2_VAAPI_HWACCEL=yes
 !CONFIG_MPEG2_VDPAU_HWACCEL=yes
+!CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL=yes
 !CONFIG_MPEG4_VAAPI_HWACCEL=yes
 !CONFIG_MPEG4_VDPAU_HWACCEL=yes
+!CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL=yes
 !CONFIG_VC1_D3D11VA_HWACCEL=yes
 !CONFIG_VC1_DXVA2_HWACCEL=yes
 !CONFIG_VC1_VAAPI_HWACCEL=yes
 !CONFIG_VC1_VDPAU_HWACCEL=yes
+!CONFIG_VC1_QSV_HWACCEL=yes
 !CONFIG_WMV3_D3D11VA_HWACCEL=yes
 !CONFIG_WMV3_DXVA2_HWACCEL=yes
 !CONFIG_WMV3_VAAPI_HWACCEL=yes
@@ -1980,6 +2063,7 @@ CONFIG_DVBSUB_PARSER=yes
 CONFIG_DVDSUB_PARSER=yes
 CONFIG_DVD_NAV_PARSER=yes
 CONFIG_FLAC_PARSER=yes
+CONFIG_G729_PARSER=yes
 CONFIG_GSM_PARSER=yes
 CONFIG_H261_PARSER=yes
 CONFIG_H263_PARSER=yes
@@ -2001,6 +2085,7 @@ CONFIG_VORBIS_PARSER=yes
 CONFIG_VP3_PARSER=yes
 CONFIG_VP8_PARSER=yes
 CONFIG_VP9_PARSER=yes
+CONFIG_ASYNC_PROTOCOL=yes
 !CONFIG_BLURAY_PROTOCOL=yes
 CONFIG_CACHE_PROTOCOL=yes
 CONFIG_CONCAT_PROTOCOL=yes
diff --git a/android/config-armv7-a.mak b/android/config-armv7-a.mak
index 77eab6ddc7..3c4be5be05 100644
--- a/android/config-armv7-a.mak
+++ b/android/config-armv7-a.mak
@@ -1,7 +1,7 @@
 # Automatically generated by configure - do not modify!
 ifndef FFMPEG_CONFIG_MAK
 FFMPEG_CONFIG_MAK=1
-FFMPEG_CONFIGURATION=--arch=arm --disable-neon --cpu=armv7-a --build_suffix= --cross-prefix=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8/bin/arm-linux-androideabi- --enable-cross-compile --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-arm --target-os=linux --disable-static --enable-shared --enable-optimizations --disable-doc --disable-symver --disable-ffmpeg --disable-ffplay --disable-ffprobe --disable-ffserver --disable-avdevice --disable-devices --disable-filters --disable-demuxer=srt --disable-demuxer=microdvd --disable-demuxer=jacosub --disable-demuxer=sami --disable-demuxer=realtext --disable-demuxer=dts --disable-demuxer=subviewer --disable-demuxer=subviewer1 --disable-demuxer=pjs --disable-demuxer=vplayer --disable-demuxer=mpl2 --disable-decoder=ass --disable-decoder=srt --disable-decoder=subrip --disable-decoder=microdvd --disable-decoder=jacosub --disable-decoder=sami --disable-decoder=realtext --disable-decoder=movtext --disable-decoder=subviewer --disable-decoder=subviewer1 --disable-decoder=pjs --disable-decoder=vplayer --disable-decoder=mpl2 --enable-zlib --enable-pic --disable-debug
+FFMPEG_CONFIGURATION=--arch=arm --disable-neon --cpu=armv7-a --build_suffix= --cross-prefix=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi- --enable-cross-compile --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-arm --target-os=linux --disable-static --enable-shared --enable-optimizations --disable-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
 prefix=/usr/local
 LIBDIR=$(DESTDIR)${prefix}/lib
 SHLIBDIR=$(DESTDIR)${prefix}/lib
@@ -15,24 +15,24 @@ SRC_PATH=.
 ifndef MAIN_MAKEFILE
 SRC_PATH:=$(SRC_PATH:.%=..%)
 endif
-CC_IDENT=gcc 4.8 (GCC)
+CC_IDENT=gcc 4.9.x-google (GCC) 20140827 (prerelease)
 ARCH=arm
 INTRINSICS=none
-CC=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8/bin/arm-linux-androideabi-gcc
-CXX=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8/bin/arm-linux-androideabi-g++
-AS=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8/bin/arm-linux-androideabi-gcc
-LD=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8/bin/arm-linux-androideabi-gcc
-DEPCC=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8/bin/arm-linux-androideabi-gcc
+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
+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)
-DEPAS=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8/bin/arm-linux-androideabi-gcc
+DEPAS=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-gcc
 DEPASFLAGS= $(CPPFLAGS)
 YASM=yasm
 DEPYASM=yasm
-AR=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8/bin/arm-linux-androideabi-ar
+AR=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-ar
 ARFLAGS=rcD
 AR_O=$@
-RANLIB=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8/bin/arm-linux-androideabi-ranlib -D
-STRIP=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8/bin/arm-linux-androideabi-strip
+RANLIB=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-ranlib -D
+STRIP=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-strip
 CP=cp -p
 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
@@ -50,11 +50,12 @@ LD_O=-o $@
 LD_LIB=-l%
 LD_PATH=-L
 DLLTOOL=
-WINDRES=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8/bin/arm-linux-androideabi-windres
-DEPWINDRES=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8/bin/arm-linux-androideabi-gcc
+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
 LDEXEFLAGS=
+LDLIBFLAGS=
 SHFLAGS=-shared -Wl,-soname,$$(@F) -Wl,-Bsymbolic -Wl,--version-script,$(SUBDIR)lib$(NAME).ver
 ASMSTRIPFLAGS= -wN '..@*'
 YASMFLAGS=
@@ -68,13 +69,13 @@ SLIBPREF=lib
 SLIBSUF=.so
 EXESUF=
 EXTRA_VERSION=
-CCDEP=
+CCDEP=$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< | sed -e "/^\#.*/d" -e "s,^[[:space:]]*$(*F)\\.o,$(@D)/$(*F).o," > $(@:.o=.d)
 CXXDEP=
-CCDEP_FLAGS=
-ASDEP=
-ASDEP_FLAGS=
-CC_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@
-AS_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@
+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=
 HOSTCC=gcc
 HOSTLD=gcc
 HOSTCFLAGS=  -std=c99 -Wall -O3
@@ -84,9 +85,9 @@ HOSTLDFLAGS=
 HOSTLIBS=-lm
 DEPHOSTCC=gcc
 DEPHOSTCCFLAGS= $(HOSTCCFLAGS)
-HOSTCCDEP=
-HOSTCCDEP_FLAGS=
-HOSTCC_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@
+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=
 HOSTCC_C=-c
 HOSTCC_O=-o $@
 HOSTLD_O=-o $@
@@ -112,28 +113,28 @@ SLIB_INSTALL_EXTRA_LIB=
 SLIB_INSTALL_EXTRA_SHLIB=
 SAMPLES:=$(FATE_SAMPLES)
 NOREDZONE_FLAGS=
-libavcodec_VERSION=56.41.100
+libavcodec_VERSION=56.60.100
 libavcodec_VERSION_MAJOR=56
-libavcodec_VERSION_MINOR=41
+libavcodec_VERSION_MINOR=60
 libavdevice_VERSION=56.4.100
 libavdevice_VERSION_MAJOR=56
 libavdevice_VERSION_MINOR=4
-libavfilter_VERSION=5.16.101
+libavfilter_VERSION=5.40.101
 libavfilter_VERSION_MAJOR=5
-libavfilter_VERSION_MINOR=16
-libavformat_VERSION=56.36.100
+libavfilter_VERSION_MINOR=40
+libavformat_VERSION=56.40.101
 libavformat_VERSION_MAJOR=56
-libavformat_VERSION_MINOR=36
+libavformat_VERSION_MINOR=40
 libavresample_VERSION=2.1.0
 libavresample_VERSION_MAJOR=2
 libavresample_VERSION_MINOR=1
-libavutil_VERSION=54.27.100
+libavutil_VERSION=54.31.100
 libavutil_VERSION_MAJOR=54
-libavutil_VERSION_MINOR=27
+libavutil_VERSION_MINOR=31
 libpostproc_VERSION=53.3.100
 libpostproc_VERSION_MAJOR=53
 libpostproc_VERSION_MINOR=3
-libswresample_VERSION=1.2.100
+libswresample_VERSION=1.2.101
 libswresample_VERSION_MAJOR=1
 libswresample_VERSION_MINOR=2
 libswscale_VERSION=3.1.101
@@ -214,7 +215,9 @@ HAVE_SETEND=yes
 !HAVE_MIPSDSPR1=yes
 !HAVE_MIPSDSPR2=yes
 !HAVE_MSA=yes
-!HAVE_LOONGSON3=yes
+HAVE_LOONGSON2=yes
+HAVE_LOONGSON3=yes
+!HAVE_MMI=yes
 HAVE_ARMV5TE_EXTERNAL=yes
 HAVE_ARMV6_EXTERNAL=yes
 HAVE_ARMV6T2_EXTERNAL=yes
@@ -253,7 +256,9 @@ HAVE_SETEND_EXTERNAL=yes
 !HAVE_MIPSDSPR1_EXTERNAL=yes
 !HAVE_MIPSDSPR2_EXTERNAL=yes
 !HAVE_MSA_EXTERNAL=yes
+!HAVE_LOONGSON2_EXTERNAL=yes
 !HAVE_LOONGSON3_EXTERNAL=yes
+!HAVE_MMI_EXTERNAL=yes
 HAVE_ARMV5TE_INLINE=yes
 HAVE_ARMV6_INLINE=yes
 HAVE_ARMV6T2_INLINE=yes
@@ -292,7 +297,9 @@ HAVE_SETEND_INLINE=yes
 !HAVE_MIPSDSPR1_INLINE=yes
 !HAVE_MIPSDSPR2_INLINE=yes
 !HAVE_MSA_INLINE=yes
+!HAVE_LOONGSON2_INLINE=yes
 !HAVE_LOONGSON3_INLINE=yes
+!HAVE_MMI_INLINE=yes
 !HAVE_ALIGNED_STACK=yes
 !HAVE_FAST_64BIT=yes
 HAVE_FAST_CLZ=yes
@@ -330,6 +337,7 @@ HAVE_ASM_TYPES_H=yes
 !HAVE_DEV_VIDEO_BKTR_IOCTL_BT848_H=yes
 !HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H=yes
 !HAVE_DIRECT_H=yes
+HAVE_DIRENT_H=yes
 HAVE_DLFCN_H=yes
 !HAVE_D3D11_H=yes
 !HAVE_DXVA_H=yes
@@ -364,7 +372,9 @@ HAVE_ATANF=yes
 HAVE_ATAN2F=yes
 HAVE_CBRT=yes
 HAVE_CBRTF=yes
+HAVE_COPYSIGN=yes
 HAVE_COSF=yes
+HAVE_ERF=yes
 HAVE_EXP2=yes
 HAVE_EXP2F=yes
 HAVE_EXPF=yes
@@ -414,6 +424,7 @@ HAVE_ISATTY=yes
 !HAVE_JACK_PORT_GET_LATENCY_RANGE=yes
 !HAVE_KBHIT=yes
 HAVE_LOCALTIME_R=yes
+HAVE_LSTAT=yes
 !HAVE_LZO1X_999_COMPRESS=yes
 !HAVE_MACH_ABSOLUTE_TIME=yes
 !HAVE_MAPVIEWOFFILE=yes
@@ -427,6 +438,7 @@ HAVE_POSIX_MEMALIGN=yes
 !HAVE_PTHREAD_CANCEL=yes
 HAVE_SCHED_GETAFFINITY=yes
 !HAVE_SETCONSOLETEXTATTRIBUTE=yes
+!HAVE_SETCONSOLECTRLHANDLER=yes
 !HAVE_SETMODE=yes
 HAVE_SETRLIMIT=yes
 !HAVE_SLEEP=yes
@@ -463,6 +475,7 @@ 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
@@ -509,7 +522,7 @@ CONFIG_MANPAGES=yes
 CONFIG_PODPAGES=yes
 !CONFIG_TXTPAGES=yes
 CONFIG_AVIO_READING_EXAMPLE=yes
-CONFIG_AVIO_LIST_DIR_EXAMPLE=yes
+CONFIG_AVIO_DIR_CMD_EXAMPLE=yes
 CONFIG_DECODING_ENCODING_EXAMPLE=yes
 CONFIG_DEMUXING_DECODING_EXAMPLE=yes
 CONFIG_EXTRACT_MVS_EXAMPLE=yes
@@ -551,6 +564,7 @@ CONFIG_TRANSCODING_EXAMPLE=yes
 !CONFIG_LIBGSM=yes
 !CONFIG_LIBIEC61883=yes
 !CONFIG_LIBILBC=yes
+!CONFIG_LIBKVAZAAR=yes
 !CONFIG_LIBMFX=yes
 !CONFIG_LIBMODPLUG=yes
 !CONFIG_LIBMP3LAME=yes
@@ -567,6 +581,7 @@ CONFIG_TRANSCODING_EXAMPLE=yes
 !CONFIG_LIBSCHROEDINGER=yes
 !CONFIG_LIBSHINE=yes
 !CONFIG_LIBSMBCLIENT=yes
+!CONFIG_LIBSNAPPY=yes
 !CONFIG_LIBSOXR=yes
 !CONFIG_LIBSPEEX=yes
 !CONFIG_LIBSSH=yes
@@ -618,6 +633,7 @@ CONFIG_SWSCALE_ALPHA=yes
 !CONFIG_VAAPI=yes
 !CONFIG_VDA=yes
 !CONFIG_VDPAU=yes
+!CONFIG_VIDEOTOOLBOX=yes
 !CONFIG_XVMC=yes
 !CONFIG_GPL=yes
 !CONFIG_NONFREE=yes
@@ -670,8 +686,10 @@ CONFIG_EXIF=yes
 CONFIG_FAANDCT=yes
 CONFIG_FAANIDCT=yes
 CONFIG_FDCTDSP=yes
+CONFIG_FLACDSP=yes
 CONFIG_FMTCONVERT=yes
 CONFIG_FRAME_THREAD_ENCODER=yes
+CONFIG_G722DSP=yes
 !CONFIG_GCRYPT=yes
 !CONFIG_GMP=yes
 CONFIG_GOLOMB=yes
@@ -689,7 +707,9 @@ CONFIG_IDCTDSP=yes
 CONFIG_IIRFILTER=yes
 CONFIG_IMDCT15=yes
 CONFIG_INTRAX8=yes
+CONFIG_IVIDSP=yes
 CONFIG_JPEGTABLES=yes
+!CONFIG_LIBX262=yes
 !CONFIG_LGPLV3=yes
 CONFIG_LLAUDDSP=yes
 CONFIG_LLVIDDSP=yes
@@ -700,6 +720,7 @@ CONFIG_MPEGAUDIO=yes
 CONFIG_MPEGAUDIODSP=yes
 CONFIG_MPEGVIDEO=yes
 CONFIG_MPEGVIDEOENC=yes
+CONFIG_MSS34DSP=yes
 CONFIG_PIXBLOCKDSP=yes
 CONFIG_QPELDSP=yes
 !CONFIG_QSV=yes
@@ -710,16 +731,24 @@ CONFIG_RIFFDEC=yes
 CONFIG_RIFFENC=yes
 CONFIG_RTPDEC=yes
 CONFIG_RTPENC_CHAIN=yes
+CONFIG_RV34DSP=yes
 CONFIG_SINEWIN=yes
+CONFIG_SNAPPY=yes
 CONFIG_STARTCODE=yes
+CONFIG_TEXTUREDSP=yes
+!CONFIG_TEXTUREDSPENC=yes
 CONFIG_TPELDSP=yes
 CONFIG_VIDEODSP=yes
 CONFIG_VP3DSP=yes
+CONFIG_VP56DSP=yes
+CONFIG_VP8DSP=yes
 CONFIG_WMA_FREQS=yes
+CONFIG_WMV2DSP=yes
 CONFIG_AAC_ADTSTOASC_BSF=yes
 CONFIG_CHOMP_BSF=yes
 CONFIG_DUMP_EXTRADATA_BSF=yes
 CONFIG_H264_MP4TOANNEXB_BSF=yes
+CONFIG_HEVC_MP4TOANNEXB_BSF=yes
 CONFIG_IMX_DUMP_HEADER_BSF=yes
 CONFIG_MJPEG2JPEG_BSF=yes
 CONFIG_MJPEGA_DUMP_HEADER_BSF=yes
@@ -762,6 +791,7 @@ CONFIG_COMFORTNOISE_DECODER=yes
 CONFIG_CPIA_DECODER=yes
 CONFIG_CSCD_DECODER=yes
 CONFIG_CYUV_DECODER=yes
+CONFIG_DDS_DECODER=yes
 CONFIG_DFA_DECODER=yes
 CONFIG_DIRAC_DECODER=yes
 CONFIG_DNXHD_DECODER=yes
@@ -803,7 +833,9 @@ CONFIG_H264_DECODER=yes
 !CONFIG_H264_QSV_DECODER=yes
 !CONFIG_H264_VDA_DECODER=yes
 !CONFIG_H264_VDPAU_DECODER=yes
+CONFIG_HAP_DECODER=yes
 CONFIG_HEVC_DECODER=yes
+!CONFIG_HEVC_QSV_DECODER=yes
 CONFIG_HNM4_VIDEO_DECODER=yes
 CONFIG_HQ_HQA_DECODER=yes
 CONFIG_HQX_DECODER=yes
@@ -839,6 +871,7 @@ CONFIG_MPEGVIDEO_DECODER=yes
 !CONFIG_MPEG_VDPAU_DECODER=yes
 !CONFIG_MPEG1_VDPAU_DECODER=yes
 !CONFIG_MPEG2_CRYSTALHD_DECODER=yes
+!CONFIG_MPEG2_QSV_DECODER=yes
 CONFIG_MSA1_DECODER=yes
 !CONFIG_MSMPEG4_CRYSTALHD_DECODER=yes
 CONFIG_MSMPEG4V1_DECODER=yes
@@ -917,6 +950,7 @@ CONFIG_VC1_DECODER=yes
 !CONFIG_VC1_CRYSTALHD_DECODER=yes
 !CONFIG_VC1_VDPAU_DECODER=yes
 CONFIG_VC1IMAGE_DECODER=yes
+!CONFIG_VC1_QSV_DECODER=yes
 CONFIG_VCR1_DECODER=yes
 CONFIG_VMDVIDEO_DECODER=yes
 CONFIG_VMNC_DECODER=yes
@@ -951,6 +985,7 @@ CONFIG_ZEROCODEC_DECODER=yes
 CONFIG_ZLIB_DECODER=yes
 CONFIG_ZMBV_DECODER=yes
 CONFIG_AAC_DECODER=yes
+CONFIG_AAC_FIXED_DECODER=yes
 CONFIG_AAC_LATM_DECODER=yes
 CONFIG_AC3_DECODER=yes
 CONFIG_AC3_FIXED_DECODER=yes
@@ -1093,6 +1128,7 @@ CONFIG_ADPCM_SBPRO_3_DECODER=yes
 CONFIG_ADPCM_SBPRO_4_DECODER=yes
 CONFIG_ADPCM_SWF_DECODER=yes
 CONFIG_ADPCM_THP_DECODER=yes
+CONFIG_ADPCM_THP_LE_DECODER=yes
 CONFIG_ADPCM_VIMA_DECODER=yes
 CONFIG_ADPCM_XA_DECODER=yes
 CONFIG_ADPCM_YAMAHA_DECODER=yes
@@ -1140,6 +1176,7 @@ CONFIG_XSUB_DECODER=yes
 CONFIG_BINTEXT_DECODER=yes
 CONFIG_XBIN_DECODER=yes
 CONFIG_IDF_DECODER=yes
+CONFIG_AA_DEMUXER=yes
 CONFIG_AAC_DEMUXER=yes
 CONFIG_AC3_DEMUXER=yes
 CONFIG_ACT_DEMUXER=yes
@@ -1156,6 +1193,7 @@ CONFIG_APE_DEMUXER=yes
 CONFIG_APNG_DEMUXER=yes
 CONFIG_AQTITLE_DEMUXER=yes
 CONFIG_ASF_DEMUXER=yes
+CONFIG_ASF_O_DEMUXER=yes
 CONFIG_ASS_DEMUXER=yes
 CONFIG_AST_DEMUXER=yes
 CONFIG_AU_DEMUXER=yes
@@ -1169,6 +1207,7 @@ CONFIG_BINTEXT_DEMUXER=yes
 CONFIG_BINK_DEMUXER=yes
 CONFIG_BIT_DEMUXER=yes
 CONFIG_BMV_DEMUXER=yes
+CONFIG_BFSTM_DEMUXER=yes
 CONFIG_BRSTM_DEMUXER=yes
 CONFIG_BOA_DEMUXER=yes
 CONFIG_C93_DEMUXER=yes
@@ -1365,6 +1404,7 @@ CONFIG_XWMA_DEMUXER=yes
 CONFIG_YOP_DEMUXER=yes
 CONFIG_YUV4MPEGPIPE_DEMUXER=yes
 CONFIG_IMAGE_BMP_PIPE_DEMUXER=yes
+CONFIG_IMAGE_DDS_PIPE_DEMUXER=yes
 CONFIG_IMAGE_DPX_PIPE_DEMUXER=yes
 CONFIG_IMAGE_EXR_PIPE_DEMUXER=yes
 CONFIG_IMAGE_J2K_PIPE_DEMUXER=yes
@@ -1407,6 +1447,7 @@ CONFIG_GIF_ENCODER=yes
 CONFIG_H261_ENCODER=yes
 CONFIG_H263_ENCODER=yes
 CONFIG_H263P_ENCODER=yes
+!CONFIG_HAP_ENCODER=yes
 CONFIG_HUFFYUV_ENCODER=yes
 CONFIG_JPEG2000_ENCODER=yes
 CONFIG_JPEGLS_ENCODER=yes
@@ -1542,6 +1583,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_LIBWAVPACK_ENCODER=yes
 !CONFIG_LIBWEBP_ANIM_ENCODER=yes
 !CONFIG_LIBWEBP_ENCODER=yes
+!CONFIG_LIBX262_ENCODER=yes
 !CONFIG_LIBX264_ENCODER=yes
 !CONFIG_LIBX264RGB_ENCODER=yes
 !CONFIG_LIBX265_ENCODER=yes
@@ -1553,6 +1595,10 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_NVENC_ENCODER=yes
 !CONFIG_NVENC_H264_ENCODER=yes
 !CONFIG_NVENC_HEVC_ENCODER=yes
+!CONFIG_HEVC_QSV_ENCODER=yes
+!CONFIG_LIBKVAZAAR_ENCODER=yes
+!CONFIG_MPEG2_QSV_ENCODER=yes
+!CONFIG_ACROSSFADE_FILTER=yes
 !CONFIG_ADELAY_FILTER=yes
 !CONFIG_AECHO_FILTER=yes
 !CONFIG_AEVAL_FILTER=yes
@@ -1567,6 +1613,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_APERMS_FILTER=yes
 !CONFIG_APHASER_FILTER=yes
 !CONFIG_ARESAMPLE_FILTER=yes
+!CONFIG_AREVERSE_FILTER=yes
 !CONFIG_ASELECT_FILTER=yes
 !CONFIG_ASENDCMD_FILTER=yes
 !CONFIG_ASETNSAMPLES_FILTER=yes
@@ -1591,6 +1638,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_CHORUS_FILTER=yes
 !CONFIG_COMPAND_FILTER=yes
 !CONFIG_DCSHIFT_FILTER=yes
+!CONFIG_DYNAUDNORM_FILTER=yes
 !CONFIG_EARWAX_FILTER=yes
 !CONFIG_EBUR128_FILTER=yes
 !CONFIG_EQUALIZER_FILTER=yes
@@ -1602,6 +1650,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_PAN_FILTER=yes
 !CONFIG_REPLAYGAIN_FILTER=yes
 !CONFIG_RESAMPLE_FILTER=yes
+!CONFIG_SIDECHAINCOMPRESS_FILTER=yes
 !CONFIG_SILENCEDETECT_FILTER=yes
 !CONFIG_SILENCEREMOVE_FILTER=yes
 !CONFIG_TREBLE_FILTER=yes
@@ -1614,6 +1663,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_ANULLSINK_FILTER=yes
 !CONFIG_ALPHAEXTRACT_FILTER=yes
 !CONFIG_ALPHAMERGE_FILTER=yes
+!CONFIG_ATADENOISE_FILTER=yes
 !CONFIG_ASS_FILTER=yes
 !CONFIG_BBOX_FILTER=yes
 !CONFIG_BLACKDETECT_FILTER=yes
@@ -1623,6 +1673,7 @@ CONFIG_XSUB_ENCODER=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_COPY_FILTER=yes
@@ -1631,17 +1682,22 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_CROPDETECT_FILTER=yes
 !CONFIG_CURVES_FILTER=yes
 !CONFIG_DCTDNOIZ_FILTER=yes
+!CONFIG_DEBAND_FILTER=yes
 !CONFIG_DECIMATE_FILTER=yes
+!CONFIG_DEFLATE_FILTER=yes
 !CONFIG_DEJUDDER_FILTER=yes
 !CONFIG_DELOGO_FILTER=yes
 !CONFIG_DESHAKE_FILTER=yes
 !CONFIG_DETELECINE_FILTER=yes
+!CONFIG_DILATION_FILTER=yes
 !CONFIG_DRAWBOX_FILTER=yes
+!CONFIG_DRAWGRAPH_FILTER=yes
 !CONFIG_DRAWGRID_FILTER=yes
 !CONFIG_DRAWTEXT_FILTER=yes
 !CONFIG_EDGEDETECT_FILTER=yes
 !CONFIG_ELBG_FILTER=yes
 !CONFIG_EQ_FILTER=yes
+!CONFIG_EROSION_FILTER=yes
 !CONFIG_EXTRACTPLANES_FILTER=yes
 !CONFIG_FADE_FILTER=yes
 !CONFIG_FFTFILT_FILTER=yes
@@ -1652,6 +1708,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_FORMAT_FILTER=yes
 !CONFIG_FPS_FILTER=yes
 !CONFIG_FRAMEPACK_FILTER=yes
+!CONFIG_FRAMERATE_FILTER=yes
 !CONFIG_FRAMESTEP_FILTER=yes
 !CONFIG_FREI0R_FILTER=yes
 !CONFIG_FSPP_FILTER=yes
@@ -1663,9 +1720,11 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_HISTOGRAM_FILTER=yes
 !CONFIG_HQDN3D_FILTER=yes
 !CONFIG_HQX_FILTER=yes
+!CONFIG_HSTACK_FILTER=yes
 !CONFIG_HUE_FILTER=yes
 !CONFIG_IDET_FILTER=yes
 !CONFIG_IL_FILTER=yes
+!CONFIG_INFLATE_FILTER=yes
 !CONFIG_INTERLACE_FILTER=yes
 !CONFIG_INTERLEAVE_FILTER=yes
 !CONFIG_KERNDEINT_FILTER=yes
@@ -1696,11 +1755,15 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_PSNR_FILTER=yes
 !CONFIG_PULLUP_FILTER=yes
 !CONFIG_QP_FILTER=yes
+!CONFIG_RANDOM_FILTER=yes
+!CONFIG_REMOVEGRAIN_FILTER=yes
 !CONFIG_REMOVELOGO_FILTER=yes
 !CONFIG_REPEATFIELDS_FILTER=yes
+!CONFIG_REVERSE_FILTER=yes
 !CONFIG_ROTATE_FILTER=yes
 !CONFIG_SAB_FILTER=yes
 !CONFIG_SCALE_FILTER=yes
+!CONFIG_SCALE2REF_FILTER=yes
 !CONFIG_SELECT_FILTER=yes
 !CONFIG_SENDCMD_FILTER=yes
 !CONFIG_SEPARATEFIELDS_FILTER=yes
@@ -1716,6 +1779,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_SMARTBLUR_FILTER=yes
 !CONFIG_SPLIT_FILTER=yes
 !CONFIG_SPP_FILTER=yes
+!CONFIG_SSIM_FILTER=yes
 !CONFIG_STEREO3D_FILTER=yes
 !CONFIG_SUBTITLES_FILTER=yes
 !CONFIG_SUPER2XSAI_FILTER=yes
@@ -1729,15 +1793,20 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_TRIM_FILTER=yes
 !CONFIG_UNSHARP_FILTER=yes
 !CONFIG_USPP_FILTER=yes
+!CONFIG_VECTORSCOPE_FILTER=yes
 !CONFIG_VFLIP_FILTER=yes
 !CONFIG_VIDSTABDETECT_FILTER=yes
 !CONFIG_VIDSTABTRANSFORM_FILTER=yes
 !CONFIG_VIGNETTE_FILTER=yes
+!CONFIG_VSTACK_FILTER=yes
 !CONFIG_W3FDIF_FILTER=yes
+!CONFIG_WAVEFORM_FILTER=yes
 !CONFIG_XBR_FILTER=yes
 !CONFIG_YADIF_FILTER=yes
 !CONFIG_ZMQ_FILTER=yes
 !CONFIG_ZOOMPAN_FILTER=yes
+!CONFIG_ALLRGB_FILTER=yes
+!CONFIG_ALLYUV_FILTER=yes
 !CONFIG_CELLAUTO_FILTER=yes
 !CONFIG_COLOR_FILTER=yes
 !CONFIG_FREI0R_SRC_FILTER=yes
@@ -1751,16 +1820,21 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_SMPTEHDBARS_FILTER=yes
 !CONFIG_TESTSRC_FILTER=yes
 !CONFIG_NULLSINK_FILTER=yes
+!CONFIG_ADRAWGRAPH_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_SHOWVOLUME_FILTER=yes
 !CONFIG_SHOWWAVES_FILTER=yes
 !CONFIG_SHOWWAVESPIC_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
 !CONFIG_H264_MMAL_HWACCEL=yes
@@ -1769,21 +1843,30 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_H264_VDA_HWACCEL=yes
 !CONFIG_H264_VDA_OLD_HWACCEL=yes
 !CONFIG_H264_VDPAU_HWACCEL=yes
+!CONFIG_H264_VIDEOTOOLBOX_HWACCEL=yes
 !CONFIG_HEVC_D3D11VA_HWACCEL=yes
 !CONFIG_HEVC_DXVA2_HWACCEL=yes
+!CONFIG_HEVC_QSV_HWACCEL=yes
+!CONFIG_HEVC_VAAPI_HWACCEL=yes
+!CONFIG_HEVC_VDPAU_HWACCEL=yes
 !CONFIG_MPEG1_XVMC_HWACCEL=yes
 !CONFIG_MPEG1_VDPAU_HWACCEL=yes
+!CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL=yes
 !CONFIG_MPEG2_XVMC_HWACCEL=yes
 !CONFIG_MPEG2_D3D11VA_HWACCEL=yes
 !CONFIG_MPEG2_DXVA2_HWACCEL=yes
+!CONFIG_MPEG2_QSV_HWACCEL=yes
 !CONFIG_MPEG2_VAAPI_HWACCEL=yes
 !CONFIG_MPEG2_VDPAU_HWACCEL=yes
+!CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL=yes
 !CONFIG_MPEG4_VAAPI_HWACCEL=yes
 !CONFIG_MPEG4_VDPAU_HWACCEL=yes
+!CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL=yes
 !CONFIG_VC1_D3D11VA_HWACCEL=yes
 !CONFIG_VC1_DXVA2_HWACCEL=yes
 !CONFIG_VC1_VAAPI_HWACCEL=yes
 !CONFIG_VC1_VDPAU_HWACCEL=yes
+!CONFIG_VC1_QSV_HWACCEL=yes
 !CONFIG_WMV3_D3D11VA_HWACCEL=yes
 !CONFIG_WMV3_DXVA2_HWACCEL=yes
 !CONFIG_WMV3_VAAPI_HWACCEL=yes
@@ -1980,6 +2063,7 @@ CONFIG_DVBSUB_PARSER=yes
 CONFIG_DVDSUB_PARSER=yes
 CONFIG_DVD_NAV_PARSER=yes
 CONFIG_FLAC_PARSER=yes
+CONFIG_G729_PARSER=yes
 CONFIG_GSM_PARSER=yes
 CONFIG_H261_PARSER=yes
 CONFIG_H263_PARSER=yes
@@ -2001,6 +2085,7 @@ CONFIG_VORBIS_PARSER=yes
 CONFIG_VP3_PARSER=yes
 CONFIG_VP8_PARSER=yes
 CONFIG_VP9_PARSER=yes
+CONFIG_ASYNC_PROTOCOL=yes
 !CONFIG_BLURAY_PROTOCOL=yes
 CONFIG_CACHE_PROTOCOL=yes
 CONFIG_CONCAT_PROTOCOL=yes
diff --git a/android/config-armv8-a.mak b/android/config-armv8-a.mak
index 2dcdab1701..e326c4949e 100644
--- a/android/config-armv8-a.mak
+++ b/android/config-armv8-a.mak
@@ -15,7 +15,7 @@ SRC_PATH=.
 ifndef MAIN_MAKEFILE
 SRC_PATH:=$(SRC_PATH:.%=..%)
 endif
-CC_IDENT=gcc 4.9 (GCC) 20140514 (prerelease)
+CC_IDENT=gcc 4.9.x-google (GCC) 20140827 (prerelease)
 ARCH=aarch64
 INTRINSICS=neon
 CC=../../prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin/aarch64-linux-android-gcc
@@ -55,6 +55,7 @@ DEPWINDRES=../../prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin/a
 DOXYGEN=doxygen
 LDFLAGS=  --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-arm64 -isysroot ../../prebuilts/ndk/current/platforms/android-21/arch-arm64 -Wl,--as-needed -Wl,-z,noexecstack -Wl,--warn-common -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample
 LDEXEFLAGS=
+LDLIBFLAGS=
 SHFLAGS=-shared -Wl,-soname,$$(@F) -Wl,-Bsymbolic -Wl,--version-script,$(SUBDIR)lib$(NAME).ver
 ASMSTRIPFLAGS= -wN '..@*'
 YASMFLAGS=
@@ -68,13 +69,13 @@ SLIBPREF=lib
 SLIBSUF=.so
 EXESUF=
 EXTRA_VERSION=
-CCDEP=
+CCDEP=$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< | sed -e "/^\#.*/d" -e "s,^[[:space:]]*$(*F)\\.o,$(@D)/$(*F).o," > $(@:.o=.d)
 CXXDEP=
-CCDEP_FLAGS=
-ASDEP=
-ASDEP_FLAGS=
-CC_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@
-AS_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@
+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=
 HOSTCC=gcc
 HOSTLD=gcc
 HOSTCFLAGS=  -std=c99 -Wall -O3
@@ -84,9 +85,9 @@ HOSTLDFLAGS=
 HOSTLIBS=-lm
 DEPHOSTCC=gcc
 DEPHOSTCCFLAGS= $(HOSTCCFLAGS)
-HOSTCCDEP=
-HOSTCCDEP_FLAGS=
-HOSTCC_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@
+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=
 HOSTCC_C=-c
 HOSTCC_O=-o $@
 HOSTLD_O=-o $@
@@ -112,28 +113,28 @@ SLIB_INSTALL_EXTRA_LIB=
 SLIB_INSTALL_EXTRA_SHLIB=
 SAMPLES:=$(FATE_SAMPLES)
 NOREDZONE_FLAGS=
-libavcodec_VERSION=56.41.100
+libavcodec_VERSION=56.60.100
 libavcodec_VERSION_MAJOR=56
-libavcodec_VERSION_MINOR=41
+libavcodec_VERSION_MINOR=60
 libavdevice_VERSION=56.4.100
 libavdevice_VERSION_MAJOR=56
 libavdevice_VERSION_MINOR=4
-libavfilter_VERSION=5.16.101
+libavfilter_VERSION=5.40.101
 libavfilter_VERSION_MAJOR=5
-libavfilter_VERSION_MINOR=16
-libavformat_VERSION=56.36.100
+libavfilter_VERSION_MINOR=40
+libavformat_VERSION=56.40.101
 libavformat_VERSION_MAJOR=56
-libavformat_VERSION_MINOR=36
+libavformat_VERSION_MINOR=40
 libavresample_VERSION=2.1.0
 libavresample_VERSION_MAJOR=2
 libavresample_VERSION_MINOR=1
-libavutil_VERSION=54.27.100
+libavutil_VERSION=54.31.100
 libavutil_VERSION_MAJOR=54
-libavutil_VERSION_MINOR=27
+libavutil_VERSION_MINOR=31
 libpostproc_VERSION=53.3.100
 libpostproc_VERSION_MAJOR=53
 libpostproc_VERSION_MINOR=3
-libswresample_VERSION=1.2.100
+libswresample_VERSION=1.2.101
 libswresample_VERSION_MAJOR=1
 libswresample_VERSION_MINOR=2
 libswscale_VERSION=3.1.101
@@ -214,7 +215,9 @@ HAVE_VFP=yes
 !HAVE_MIPSDSPR1=yes
 !HAVE_MIPSDSPR2=yes
 !HAVE_MSA=yes
-!HAVE_LOONGSON3=yes
+HAVE_LOONGSON2=yes
+HAVE_LOONGSON3=yes
+!HAVE_MMI=yes
 !HAVE_ARMV5TE_EXTERNAL=yes
 !HAVE_ARMV6_EXTERNAL=yes
 !HAVE_ARMV6T2_EXTERNAL=yes
@@ -253,7 +256,9 @@ HAVE_VFP_EXTERNAL=yes
 !HAVE_MIPSDSPR1_EXTERNAL=yes
 !HAVE_MIPSDSPR2_EXTERNAL=yes
 !HAVE_MSA_EXTERNAL=yes
+!HAVE_LOONGSON2_EXTERNAL=yes
 !HAVE_LOONGSON3_EXTERNAL=yes
+!HAVE_MMI_EXTERNAL=yes
 !HAVE_ARMV5TE_INLINE=yes
 !HAVE_ARMV6_INLINE=yes
 !HAVE_ARMV6T2_INLINE=yes
@@ -292,7 +297,9 @@ HAVE_VFP_INLINE=yes
 !HAVE_MIPSDSPR1_INLINE=yes
 !HAVE_MIPSDSPR2_INLINE=yes
 !HAVE_MSA_INLINE=yes
+!HAVE_LOONGSON2_INLINE=yes
 !HAVE_LOONGSON3_INLINE=yes
+!HAVE_MMI_INLINE=yes
 HAVE_ALIGNED_STACK=yes
 HAVE_FAST_64BIT=yes
 HAVE_FAST_CLZ=yes
@@ -330,6 +337,7 @@ HAVE_ASM_TYPES_H=yes
 !HAVE_DEV_VIDEO_BKTR_IOCTL_BT848_H=yes
 !HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H=yes
 !HAVE_DIRECT_H=yes
+HAVE_DIRENT_H=yes
 HAVE_DLFCN_H=yes
 !HAVE_D3D11_H=yes
 !HAVE_DXVA_H=yes
@@ -364,7 +372,9 @@ HAVE_ATANF=yes
 HAVE_ATAN2F=yes
 HAVE_CBRT=yes
 HAVE_CBRTF=yes
+HAVE_COPYSIGN=yes
 HAVE_COSF=yes
+HAVE_ERF=yes
 HAVE_EXP2=yes
 HAVE_EXP2F=yes
 HAVE_EXPF=yes
@@ -414,6 +424,7 @@ HAVE_ISATTY=yes
 !HAVE_JACK_PORT_GET_LATENCY_RANGE=yes
 !HAVE_KBHIT=yes
 HAVE_LOCALTIME_R=yes
+HAVE_LSTAT=yes
 !HAVE_LZO1X_999_COMPRESS=yes
 !HAVE_MACH_ABSOLUTE_TIME=yes
 !HAVE_MAPVIEWOFFILE=yes
@@ -427,6 +438,7 @@ HAVE_POSIX_MEMALIGN=yes
 !HAVE_PTHREAD_CANCEL=yes
 HAVE_SCHED_GETAFFINITY=yes
 !HAVE_SETCONSOLETEXTATTRIBUTE=yes
+!HAVE_SETCONSOLECTRLHANDLER=yes
 !HAVE_SETMODE=yes
 HAVE_SETRLIMIT=yes
 !HAVE_SLEEP=yes
@@ -463,6 +475,7 @@ 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
@@ -509,7 +522,7 @@ CONFIG_MANPAGES=yes
 CONFIG_PODPAGES=yes
 !CONFIG_TXTPAGES=yes
 CONFIG_AVIO_READING_EXAMPLE=yes
-CONFIG_AVIO_LIST_DIR_EXAMPLE=yes
+CONFIG_AVIO_DIR_CMD_EXAMPLE=yes
 CONFIG_DECODING_ENCODING_EXAMPLE=yes
 CONFIG_DEMUXING_DECODING_EXAMPLE=yes
 CONFIG_EXTRACT_MVS_EXAMPLE=yes
@@ -551,6 +564,7 @@ CONFIG_TRANSCODING_EXAMPLE=yes
 !CONFIG_LIBGSM=yes
 !CONFIG_LIBIEC61883=yes
 !CONFIG_LIBILBC=yes
+!CONFIG_LIBKVAZAAR=yes
 !CONFIG_LIBMFX=yes
 !CONFIG_LIBMODPLUG=yes
 !CONFIG_LIBMP3LAME=yes
@@ -567,6 +581,7 @@ CONFIG_TRANSCODING_EXAMPLE=yes
 !CONFIG_LIBSCHROEDINGER=yes
 !CONFIG_LIBSHINE=yes
 !CONFIG_LIBSMBCLIENT=yes
+!CONFIG_LIBSNAPPY=yes
 !CONFIG_LIBSOXR=yes
 !CONFIG_LIBSPEEX=yes
 !CONFIG_LIBSSH=yes
@@ -618,6 +633,7 @@ CONFIG_SWSCALE_ALPHA=yes
 !CONFIG_VAAPI=yes
 !CONFIG_VDA=yes
 !CONFIG_VDPAU=yes
+!CONFIG_VIDEOTOOLBOX=yes
 !CONFIG_XVMC=yes
 !CONFIG_GPL=yes
 !CONFIG_NONFREE=yes
@@ -670,8 +686,10 @@ CONFIG_EXIF=yes
 CONFIG_FAANDCT=yes
 CONFIG_FAANIDCT=yes
 CONFIG_FDCTDSP=yes
+CONFIG_FLACDSP=yes
 CONFIG_FMTCONVERT=yes
 CONFIG_FRAME_THREAD_ENCODER=yes
+CONFIG_G722DSP=yes
 !CONFIG_GCRYPT=yes
 !CONFIG_GMP=yes
 CONFIG_GOLOMB=yes
@@ -689,7 +707,9 @@ CONFIG_IDCTDSP=yes
 CONFIG_IIRFILTER=yes
 CONFIG_IMDCT15=yes
 CONFIG_INTRAX8=yes
+CONFIG_IVIDSP=yes
 CONFIG_JPEGTABLES=yes
+!CONFIG_LIBX262=yes
 !CONFIG_LGPLV3=yes
 CONFIG_LLAUDDSP=yes
 CONFIG_LLVIDDSP=yes
@@ -700,6 +720,7 @@ CONFIG_MPEGAUDIO=yes
 CONFIG_MPEGAUDIODSP=yes
 CONFIG_MPEGVIDEO=yes
 CONFIG_MPEGVIDEOENC=yes
+CONFIG_MSS34DSP=yes
 CONFIG_PIXBLOCKDSP=yes
 CONFIG_QPELDSP=yes
 !CONFIG_QSV=yes
@@ -710,16 +731,24 @@ CONFIG_RIFFDEC=yes
 CONFIG_RIFFENC=yes
 CONFIG_RTPDEC=yes
 CONFIG_RTPENC_CHAIN=yes
+CONFIG_RV34DSP=yes
 CONFIG_SINEWIN=yes
+CONFIG_SNAPPY=yes
 CONFIG_STARTCODE=yes
+CONFIG_TEXTUREDSP=yes
+!CONFIG_TEXTUREDSPENC=yes
 CONFIG_TPELDSP=yes
 CONFIG_VIDEODSP=yes
 CONFIG_VP3DSP=yes
+CONFIG_VP56DSP=yes
+CONFIG_VP8DSP=yes
 CONFIG_WMA_FREQS=yes
+CONFIG_WMV2DSP=yes
 CONFIG_AAC_ADTSTOASC_BSF=yes
 CONFIG_CHOMP_BSF=yes
 CONFIG_DUMP_EXTRADATA_BSF=yes
 CONFIG_H264_MP4TOANNEXB_BSF=yes
+CONFIG_HEVC_MP4TOANNEXB_BSF=yes
 CONFIG_IMX_DUMP_HEADER_BSF=yes
 CONFIG_MJPEG2JPEG_BSF=yes
 CONFIG_MJPEGA_DUMP_HEADER_BSF=yes
@@ -762,6 +791,7 @@ CONFIG_COMFORTNOISE_DECODER=yes
 CONFIG_CPIA_DECODER=yes
 CONFIG_CSCD_DECODER=yes
 CONFIG_CYUV_DECODER=yes
+CONFIG_DDS_DECODER=yes
 CONFIG_DFA_DECODER=yes
 CONFIG_DIRAC_DECODER=yes
 CONFIG_DNXHD_DECODER=yes
@@ -803,7 +833,9 @@ CONFIG_H264_DECODER=yes
 !CONFIG_H264_QSV_DECODER=yes
 !CONFIG_H264_VDA_DECODER=yes
 !CONFIG_H264_VDPAU_DECODER=yes
+CONFIG_HAP_DECODER=yes
 CONFIG_HEVC_DECODER=yes
+!CONFIG_HEVC_QSV_DECODER=yes
 CONFIG_HNM4_VIDEO_DECODER=yes
 CONFIG_HQ_HQA_DECODER=yes
 CONFIG_HQX_DECODER=yes
@@ -839,6 +871,7 @@ CONFIG_MPEGVIDEO_DECODER=yes
 !CONFIG_MPEG_VDPAU_DECODER=yes
 !CONFIG_MPEG1_VDPAU_DECODER=yes
 !CONFIG_MPEG2_CRYSTALHD_DECODER=yes
+!CONFIG_MPEG2_QSV_DECODER=yes
 CONFIG_MSA1_DECODER=yes
 !CONFIG_MSMPEG4_CRYSTALHD_DECODER=yes
 CONFIG_MSMPEG4V1_DECODER=yes
@@ -917,6 +950,7 @@ CONFIG_VC1_DECODER=yes
 !CONFIG_VC1_CRYSTALHD_DECODER=yes
 !CONFIG_VC1_VDPAU_DECODER=yes
 CONFIG_VC1IMAGE_DECODER=yes
+!CONFIG_VC1_QSV_DECODER=yes
 CONFIG_VCR1_DECODER=yes
 CONFIG_VMDVIDEO_DECODER=yes
 CONFIG_VMNC_DECODER=yes
@@ -951,6 +985,7 @@ CONFIG_ZEROCODEC_DECODER=yes
 CONFIG_ZLIB_DECODER=yes
 CONFIG_ZMBV_DECODER=yes
 CONFIG_AAC_DECODER=yes
+CONFIG_AAC_FIXED_DECODER=yes
 CONFIG_AAC_LATM_DECODER=yes
 CONFIG_AC3_DECODER=yes
 CONFIG_AC3_FIXED_DECODER=yes
@@ -1093,6 +1128,7 @@ CONFIG_ADPCM_SBPRO_3_DECODER=yes
 CONFIG_ADPCM_SBPRO_4_DECODER=yes
 CONFIG_ADPCM_SWF_DECODER=yes
 CONFIG_ADPCM_THP_DECODER=yes
+CONFIG_ADPCM_THP_LE_DECODER=yes
 CONFIG_ADPCM_VIMA_DECODER=yes
 CONFIG_ADPCM_XA_DECODER=yes
 CONFIG_ADPCM_YAMAHA_DECODER=yes
@@ -1140,6 +1176,7 @@ CONFIG_XSUB_DECODER=yes
 CONFIG_BINTEXT_DECODER=yes
 CONFIG_XBIN_DECODER=yes
 CONFIG_IDF_DECODER=yes
+CONFIG_AA_DEMUXER=yes
 CONFIG_AAC_DEMUXER=yes
 CONFIG_AC3_DEMUXER=yes
 CONFIG_ACT_DEMUXER=yes
@@ -1156,6 +1193,7 @@ CONFIG_APE_DEMUXER=yes
 CONFIG_APNG_DEMUXER=yes
 CONFIG_AQTITLE_DEMUXER=yes
 CONFIG_ASF_DEMUXER=yes
+CONFIG_ASF_O_DEMUXER=yes
 CONFIG_ASS_DEMUXER=yes
 CONFIG_AST_DEMUXER=yes
 CONFIG_AU_DEMUXER=yes
@@ -1169,6 +1207,7 @@ CONFIG_BINTEXT_DEMUXER=yes
 CONFIG_BINK_DEMUXER=yes
 CONFIG_BIT_DEMUXER=yes
 CONFIG_BMV_DEMUXER=yes
+CONFIG_BFSTM_DEMUXER=yes
 CONFIG_BRSTM_DEMUXER=yes
 CONFIG_BOA_DEMUXER=yes
 CONFIG_C93_DEMUXER=yes
@@ -1365,6 +1404,7 @@ CONFIG_XWMA_DEMUXER=yes
 CONFIG_YOP_DEMUXER=yes
 CONFIG_YUV4MPEGPIPE_DEMUXER=yes
 CONFIG_IMAGE_BMP_PIPE_DEMUXER=yes
+CONFIG_IMAGE_DDS_PIPE_DEMUXER=yes
 CONFIG_IMAGE_DPX_PIPE_DEMUXER=yes
 CONFIG_IMAGE_EXR_PIPE_DEMUXER=yes
 CONFIG_IMAGE_J2K_PIPE_DEMUXER=yes
@@ -1407,6 +1447,7 @@ CONFIG_GIF_ENCODER=yes
 CONFIG_H261_ENCODER=yes
 CONFIG_H263_ENCODER=yes
 CONFIG_H263P_ENCODER=yes
+!CONFIG_HAP_ENCODER=yes
 CONFIG_HUFFYUV_ENCODER=yes
 CONFIG_JPEG2000_ENCODER=yes
 CONFIG_JPEGLS_ENCODER=yes
@@ -1542,6 +1583,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_LIBWAVPACK_ENCODER=yes
 !CONFIG_LIBWEBP_ANIM_ENCODER=yes
 !CONFIG_LIBWEBP_ENCODER=yes
+!CONFIG_LIBX262_ENCODER=yes
 !CONFIG_LIBX264_ENCODER=yes
 !CONFIG_LIBX264RGB_ENCODER=yes
 !CONFIG_LIBX265_ENCODER=yes
@@ -1553,6 +1595,10 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_NVENC_ENCODER=yes
 !CONFIG_NVENC_H264_ENCODER=yes
 !CONFIG_NVENC_HEVC_ENCODER=yes
+!CONFIG_HEVC_QSV_ENCODER=yes
+!CONFIG_LIBKVAZAAR_ENCODER=yes
+!CONFIG_MPEG2_QSV_ENCODER=yes
+!CONFIG_ACROSSFADE_FILTER=yes
 !CONFIG_ADELAY_FILTER=yes
 !CONFIG_AECHO_FILTER=yes
 !CONFIG_AEVAL_FILTER=yes
@@ -1567,6 +1613,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_APERMS_FILTER=yes
 !CONFIG_APHASER_FILTER=yes
 !CONFIG_ARESAMPLE_FILTER=yes
+!CONFIG_AREVERSE_FILTER=yes
 !CONFIG_ASELECT_FILTER=yes
 !CONFIG_ASENDCMD_FILTER=yes
 !CONFIG_ASETNSAMPLES_FILTER=yes
@@ -1591,6 +1638,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_CHORUS_FILTER=yes
 !CONFIG_COMPAND_FILTER=yes
 !CONFIG_DCSHIFT_FILTER=yes
+!CONFIG_DYNAUDNORM_FILTER=yes
 !CONFIG_EARWAX_FILTER=yes
 !CONFIG_EBUR128_FILTER=yes
 !CONFIG_EQUALIZER_FILTER=yes
@@ -1602,6 +1650,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_PAN_FILTER=yes
 !CONFIG_REPLAYGAIN_FILTER=yes
 !CONFIG_RESAMPLE_FILTER=yes
+!CONFIG_SIDECHAINCOMPRESS_FILTER=yes
 !CONFIG_SILENCEDETECT_FILTER=yes
 !CONFIG_SILENCEREMOVE_FILTER=yes
 !CONFIG_TREBLE_FILTER=yes
@@ -1614,6 +1663,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_ANULLSINK_FILTER=yes
 !CONFIG_ALPHAEXTRACT_FILTER=yes
 !CONFIG_ALPHAMERGE_FILTER=yes
+!CONFIG_ATADENOISE_FILTER=yes
 !CONFIG_ASS_FILTER=yes
 !CONFIG_BBOX_FILTER=yes
 !CONFIG_BLACKDETECT_FILTER=yes
@@ -1623,6 +1673,7 @@ CONFIG_XSUB_ENCODER=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_COPY_FILTER=yes
@@ -1631,17 +1682,22 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_CROPDETECT_FILTER=yes
 !CONFIG_CURVES_FILTER=yes
 !CONFIG_DCTDNOIZ_FILTER=yes
+!CONFIG_DEBAND_FILTER=yes
 !CONFIG_DECIMATE_FILTER=yes
+!CONFIG_DEFLATE_FILTER=yes
 !CONFIG_DEJUDDER_FILTER=yes
 !CONFIG_DELOGO_FILTER=yes
 !CONFIG_DESHAKE_FILTER=yes
 !CONFIG_DETELECINE_FILTER=yes
+!CONFIG_DILATION_FILTER=yes
 !CONFIG_DRAWBOX_FILTER=yes
+!CONFIG_DRAWGRAPH_FILTER=yes
 !CONFIG_DRAWGRID_FILTER=yes
 !CONFIG_DRAWTEXT_FILTER=yes
 !CONFIG_EDGEDETECT_FILTER=yes
 !CONFIG_ELBG_FILTER=yes
 !CONFIG_EQ_FILTER=yes
+!CONFIG_EROSION_FILTER=yes
 !CONFIG_EXTRACTPLANES_FILTER=yes
 !CONFIG_FADE_FILTER=yes
 !CONFIG_FFTFILT_FILTER=yes
@@ -1652,6 +1708,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_FORMAT_FILTER=yes
 !CONFIG_FPS_FILTER=yes
 !CONFIG_FRAMEPACK_FILTER=yes
+!CONFIG_FRAMERATE_FILTER=yes
 !CONFIG_FRAMESTEP_FILTER=yes
 !CONFIG_FREI0R_FILTER=yes
 !CONFIG_FSPP_FILTER=yes
@@ -1663,9 +1720,11 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_HISTOGRAM_FILTER=yes
 !CONFIG_HQDN3D_FILTER=yes
 !CONFIG_HQX_FILTER=yes
+!CONFIG_HSTACK_FILTER=yes
 !CONFIG_HUE_FILTER=yes
 !CONFIG_IDET_FILTER=yes
 !CONFIG_IL_FILTER=yes
+!CONFIG_INFLATE_FILTER=yes
 !CONFIG_INTERLACE_FILTER=yes
 !CONFIG_INTERLEAVE_FILTER=yes
 !CONFIG_KERNDEINT_FILTER=yes
@@ -1696,11 +1755,15 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_PSNR_FILTER=yes
 !CONFIG_PULLUP_FILTER=yes
 !CONFIG_QP_FILTER=yes
+!CONFIG_RANDOM_FILTER=yes
+!CONFIG_REMOVEGRAIN_FILTER=yes
 !CONFIG_REMOVELOGO_FILTER=yes
 !CONFIG_REPEATFIELDS_FILTER=yes
+!CONFIG_REVERSE_FILTER=yes
 !CONFIG_ROTATE_FILTER=yes
 !CONFIG_SAB_FILTER=yes
 !CONFIG_SCALE_FILTER=yes
+!CONFIG_SCALE2REF_FILTER=yes
 !CONFIG_SELECT_FILTER=yes
 !CONFIG_SENDCMD_FILTER=yes
 !CONFIG_SEPARATEFIELDS_FILTER=yes
@@ -1716,6 +1779,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_SMARTBLUR_FILTER=yes
 !CONFIG_SPLIT_FILTER=yes
 !CONFIG_SPP_FILTER=yes
+!CONFIG_SSIM_FILTER=yes
 !CONFIG_STEREO3D_FILTER=yes
 !CONFIG_SUBTITLES_FILTER=yes
 !CONFIG_SUPER2XSAI_FILTER=yes
@@ -1729,15 +1793,20 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_TRIM_FILTER=yes
 !CONFIG_UNSHARP_FILTER=yes
 !CONFIG_USPP_FILTER=yes
+!CONFIG_VECTORSCOPE_FILTER=yes
 !CONFIG_VFLIP_FILTER=yes
 !CONFIG_VIDSTABDETECT_FILTER=yes
 !CONFIG_VIDSTABTRANSFORM_FILTER=yes
 !CONFIG_VIGNETTE_FILTER=yes
+!CONFIG_VSTACK_FILTER=yes
 !CONFIG_W3FDIF_FILTER=yes
+!CONFIG_WAVEFORM_FILTER=yes
 !CONFIG_XBR_FILTER=yes
 !CONFIG_YADIF_FILTER=yes
 !CONFIG_ZMQ_FILTER=yes
 !CONFIG_ZOOMPAN_FILTER=yes
+!CONFIG_ALLRGB_FILTER=yes
+!CONFIG_ALLYUV_FILTER=yes
 !CONFIG_CELLAUTO_FILTER=yes
 !CONFIG_COLOR_FILTER=yes
 !CONFIG_FREI0R_SRC_FILTER=yes
@@ -1751,16 +1820,21 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_SMPTEHDBARS_FILTER=yes
 !CONFIG_TESTSRC_FILTER=yes
 !CONFIG_NULLSINK_FILTER=yes
+!CONFIG_ADRAWGRAPH_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_SHOWVOLUME_FILTER=yes
 !CONFIG_SHOWWAVES_FILTER=yes
 !CONFIG_SHOWWAVESPIC_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
 !CONFIG_H264_MMAL_HWACCEL=yes
@@ -1769,21 +1843,30 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_H264_VDA_HWACCEL=yes
 !CONFIG_H264_VDA_OLD_HWACCEL=yes
 !CONFIG_H264_VDPAU_HWACCEL=yes
+!CONFIG_H264_VIDEOTOOLBOX_HWACCEL=yes
 !CONFIG_HEVC_D3D11VA_HWACCEL=yes
 !CONFIG_HEVC_DXVA2_HWACCEL=yes
+!CONFIG_HEVC_QSV_HWACCEL=yes
+!CONFIG_HEVC_VAAPI_HWACCEL=yes
+!CONFIG_HEVC_VDPAU_HWACCEL=yes
 !CONFIG_MPEG1_XVMC_HWACCEL=yes
 !CONFIG_MPEG1_VDPAU_HWACCEL=yes
+!CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL=yes
 !CONFIG_MPEG2_XVMC_HWACCEL=yes
 !CONFIG_MPEG2_D3D11VA_HWACCEL=yes
 !CONFIG_MPEG2_DXVA2_HWACCEL=yes
+!CONFIG_MPEG2_QSV_HWACCEL=yes
 !CONFIG_MPEG2_VAAPI_HWACCEL=yes
 !CONFIG_MPEG2_VDPAU_HWACCEL=yes
+!CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL=yes
 !CONFIG_MPEG4_VAAPI_HWACCEL=yes
 !CONFIG_MPEG4_VDPAU_HWACCEL=yes
+!CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL=yes
 !CONFIG_VC1_D3D11VA_HWACCEL=yes
 !CONFIG_VC1_DXVA2_HWACCEL=yes
 !CONFIG_VC1_VAAPI_HWACCEL=yes
 !CONFIG_VC1_VDPAU_HWACCEL=yes
+!CONFIG_VC1_QSV_HWACCEL=yes
 !CONFIG_WMV3_D3D11VA_HWACCEL=yes
 !CONFIG_WMV3_DXVA2_HWACCEL=yes
 !CONFIG_WMV3_VAAPI_HWACCEL=yes
@@ -1980,6 +2063,7 @@ CONFIG_DVBSUB_PARSER=yes
 CONFIG_DVDSUB_PARSER=yes
 CONFIG_DVD_NAV_PARSER=yes
 CONFIG_FLAC_PARSER=yes
+CONFIG_G729_PARSER=yes
 CONFIG_GSM_PARSER=yes
 CONFIG_H261_PARSER=yes
 CONFIG_H263_PARSER=yes
@@ -2001,6 +2085,7 @@ CONFIG_VORBIS_PARSER=yes
 CONFIG_VP3_PARSER=yes
 CONFIG_VP8_PARSER=yes
 CONFIG_VP9_PARSER=yes
+CONFIG_ASYNC_PROTOCOL=yes
 !CONFIG_BLURAY_PROTOCOL=yes
 CONFIG_CACHE_PROTOCOL=yes
 CONFIG_CONCAT_PROTOCOL=yes
diff --git a/android/config-silvermont.mak b/android/config-silvermont.mak
index d73252a51d..0179e9b7be 100644
--- a/android/config-silvermont.mak
+++ b/android/config-silvermont.mak
@@ -15,7 +15,7 @@ SRC_PATH=.
 ifndef MAIN_MAKEFILE
 SRC_PATH:=$(SRC_PATH:.%=..%)
 endif
-CC_IDENT=gcc 4.9 (GCC) 20140514 (prerelease)
+CC_IDENT=gcc 4.9 (GCC) 20140827 (prerelease)
 ARCH=x86
 INTRINSICS=none
 CC=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android-gcc
@@ -55,6 +55,7 @@ DEPWINDRES=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64
 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
 LDEXEFLAGS=
+LDLIBFLAGS=
 SHFLAGS=-shared -Wl,-soname,$$(@F) -Wl,-Bsymbolic -Wl,--version-script,$(SUBDIR)lib$(NAME).ver
 ASMSTRIPFLAGS= -wN '..@*'
 YASMFLAGS=-f elf  -DPIC
@@ -68,13 +69,13 @@ SLIBPREF=lib
 SLIBSUF=.so
 EXESUF=
 EXTRA_VERSION=
-CCDEP=
+CCDEP=$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< | sed -e "/^\#.*/d" -e "s,^[[:space:]]*$(*F)\\.o,$(@D)/$(*F).o," > $(@:.o=.d)
 CXXDEP=
-CCDEP_FLAGS=
-ASDEP=
-ASDEP_FLAGS=
-CC_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@
-AS_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@
+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=
 HOSTCC=gcc
 HOSTLD=gcc
 HOSTCFLAGS=  -std=c99 -Wall -O3
@@ -84,9 +85,9 @@ HOSTLDFLAGS=
 HOSTLIBS=-lm
 DEPHOSTCC=gcc
 DEPHOSTCCFLAGS= $(HOSTCCFLAGS)
-HOSTCCDEP=
-HOSTCCDEP_FLAGS=
-HOSTCC_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@
+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=
 HOSTCC_C=-c
 HOSTCC_O=-o $@
 HOSTLD_O=-o $@
@@ -112,28 +113,28 @@ SLIB_INSTALL_EXTRA_LIB=
 SLIB_INSTALL_EXTRA_SHLIB=
 SAMPLES:=$(FATE_SAMPLES)
 NOREDZONE_FLAGS=-mno-red-zone
-libavcodec_VERSION=56.41.100
+libavcodec_VERSION=56.60.100
 libavcodec_VERSION_MAJOR=56
-libavcodec_VERSION_MINOR=41
+libavcodec_VERSION_MINOR=60
 libavdevice_VERSION=56.4.100
 libavdevice_VERSION_MAJOR=56
 libavdevice_VERSION_MINOR=4
-libavfilter_VERSION=5.16.101
+libavfilter_VERSION=5.40.101
 libavfilter_VERSION_MAJOR=5
-libavfilter_VERSION_MINOR=16
-libavformat_VERSION=56.36.100
+libavfilter_VERSION_MINOR=40
+libavformat_VERSION=56.40.101
 libavformat_VERSION_MAJOR=56
-libavformat_VERSION_MINOR=36
+libavformat_VERSION_MINOR=40
 libavresample_VERSION=2.1.0
 libavresample_VERSION_MAJOR=2
 libavresample_VERSION_MINOR=1
-libavutil_VERSION=54.27.100
+libavutil_VERSION=54.31.100
 libavutil_VERSION_MAJOR=54
-libavutil_VERSION_MINOR=27
+libavutil_VERSION_MINOR=31
 libpostproc_VERSION=53.3.100
 libpostproc_VERSION_MAJOR=53
 libpostproc_VERSION_MINOR=3
-libswresample_VERSION=1.2.100
+libswresample_VERSION=1.2.101
 libswresample_VERSION_MAJOR=1
 libswresample_VERSION_MINOR=2
 libswscale_VERSION=3.1.101
@@ -214,7 +215,9 @@ HAVE_I686=yes
 !HAVE_MIPSDSPR1=yes
 !HAVE_MIPSDSPR2=yes
 !HAVE_MSA=yes
-!HAVE_LOONGSON3=yes
+HAVE_LOONGSON2=yes
+HAVE_LOONGSON3=yes
+!HAVE_MMI=yes
 !HAVE_ARMV5TE_EXTERNAL=yes
 !HAVE_ARMV6_EXTERNAL=yes
 !HAVE_ARMV6T2_EXTERNAL=yes
@@ -253,7 +256,9 @@ HAVE_XOP_EXTERNAL=yes
 !HAVE_MIPSDSPR1_EXTERNAL=yes
 !HAVE_MIPSDSPR2_EXTERNAL=yes
 !HAVE_MSA_EXTERNAL=yes
+!HAVE_LOONGSON2_EXTERNAL=yes
 !HAVE_LOONGSON3_EXTERNAL=yes
+!HAVE_MMI_EXTERNAL=yes
 !HAVE_ARMV5TE_INLINE=yes
 !HAVE_ARMV6_INLINE=yes
 !HAVE_ARMV6T2_INLINE=yes
@@ -292,7 +297,9 @@ HAVE_XOP_INLINE=yes
 !HAVE_MIPSDSPR1_INLINE=yes
 !HAVE_MIPSDSPR2_INLINE=yes
 !HAVE_MSA_INLINE=yes
+!HAVE_LOONGSON2_INLINE=yes
 !HAVE_LOONGSON3_INLINE=yes
+!HAVE_MMI_INLINE=yes
 HAVE_ALIGNED_STACK=yes
 !HAVE_FAST_64BIT=yes
 HAVE_FAST_CLZ=yes
@@ -330,6 +337,7 @@ HAVE_ASM_TYPES_H=yes
 !HAVE_DEV_VIDEO_BKTR_IOCTL_BT848_H=yes
 !HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H=yes
 !HAVE_DIRECT_H=yes
+HAVE_DIRENT_H=yes
 HAVE_DLFCN_H=yes
 !HAVE_D3D11_H=yes
 !HAVE_DXVA_H=yes
@@ -364,7 +372,9 @@ HAVE_ATANF=yes
 HAVE_ATAN2F=yes
 HAVE_CBRT=yes
 HAVE_CBRTF=yes
+HAVE_COPYSIGN=yes
 HAVE_COSF=yes
+HAVE_ERF=yes
 HAVE_EXP2=yes
 HAVE_EXP2F=yes
 HAVE_EXPF=yes
@@ -414,6 +424,7 @@ HAVE_ISATTY=yes
 !HAVE_JACK_PORT_GET_LATENCY_RANGE=yes
 !HAVE_KBHIT=yes
 HAVE_LOCALTIME_R=yes
+HAVE_LSTAT=yes
 !HAVE_LZO1X_999_COMPRESS=yes
 !HAVE_MACH_ABSOLUTE_TIME=yes
 !HAVE_MAPVIEWOFFILE=yes
@@ -427,6 +438,7 @@ HAVE_POSIX_MEMALIGN=yes
 !HAVE_PTHREAD_CANCEL=yes
 HAVE_SCHED_GETAFFINITY=yes
 !HAVE_SETCONSOLETEXTATTRIBUTE=yes
+!HAVE_SETCONSOLECTRLHANDLER=yes
 !HAVE_SETMODE=yes
 HAVE_SETRLIMIT=yes
 !HAVE_SLEEP=yes
@@ -463,6 +475,7 @@ 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
@@ -509,7 +522,7 @@ CONFIG_MANPAGES=yes
 CONFIG_PODPAGES=yes
 !CONFIG_TXTPAGES=yes
 CONFIG_AVIO_READING_EXAMPLE=yes
-CONFIG_AVIO_LIST_DIR_EXAMPLE=yes
+CONFIG_AVIO_DIR_CMD_EXAMPLE=yes
 CONFIG_DECODING_ENCODING_EXAMPLE=yes
 CONFIG_DEMUXING_DECODING_EXAMPLE=yes
 CONFIG_EXTRACT_MVS_EXAMPLE=yes
@@ -551,6 +564,7 @@ CONFIG_TRANSCODING_EXAMPLE=yes
 !CONFIG_LIBGSM=yes
 !CONFIG_LIBIEC61883=yes
 !CONFIG_LIBILBC=yes
+!CONFIG_LIBKVAZAAR=yes
 !CONFIG_LIBMFX=yes
 !CONFIG_LIBMODPLUG=yes
 !CONFIG_LIBMP3LAME=yes
@@ -567,6 +581,7 @@ CONFIG_TRANSCODING_EXAMPLE=yes
 !CONFIG_LIBSCHROEDINGER=yes
 !CONFIG_LIBSHINE=yes
 !CONFIG_LIBSMBCLIENT=yes
+!CONFIG_LIBSNAPPY=yes
 !CONFIG_LIBSOXR=yes
 !CONFIG_LIBSPEEX=yes
 !CONFIG_LIBSSH=yes
@@ -618,6 +633,7 @@ CONFIG_SWSCALE_ALPHA=yes
 !CONFIG_VAAPI=yes
 !CONFIG_VDA=yes
 !CONFIG_VDPAU=yes
+!CONFIG_VIDEOTOOLBOX=yes
 !CONFIG_XVMC=yes
 !CONFIG_GPL=yes
 !CONFIG_NONFREE=yes
@@ -670,8 +686,10 @@ CONFIG_EXIF=yes
 CONFIG_FAANDCT=yes
 CONFIG_FAANIDCT=yes
 CONFIG_FDCTDSP=yes
+CONFIG_FLACDSP=yes
 CONFIG_FMTCONVERT=yes
 CONFIG_FRAME_THREAD_ENCODER=yes
+CONFIG_G722DSP=yes
 !CONFIG_GCRYPT=yes
 !CONFIG_GMP=yes
 CONFIG_GOLOMB=yes
@@ -689,7 +707,9 @@ CONFIG_IDCTDSP=yes
 CONFIG_IIRFILTER=yes
 CONFIG_IMDCT15=yes
 CONFIG_INTRAX8=yes
+CONFIG_IVIDSP=yes
 CONFIG_JPEGTABLES=yes
+!CONFIG_LIBX262=yes
 !CONFIG_LGPLV3=yes
 CONFIG_LLAUDDSP=yes
 CONFIG_LLVIDDSP=yes
@@ -700,6 +720,7 @@ CONFIG_MPEGAUDIO=yes
 CONFIG_MPEGAUDIODSP=yes
 CONFIG_MPEGVIDEO=yes
 CONFIG_MPEGVIDEOENC=yes
+CONFIG_MSS34DSP=yes
 CONFIG_PIXBLOCKDSP=yes
 CONFIG_QPELDSP=yes
 !CONFIG_QSV=yes
@@ -710,16 +731,24 @@ CONFIG_RIFFDEC=yes
 CONFIG_RIFFENC=yes
 CONFIG_RTPDEC=yes
 CONFIG_RTPENC_CHAIN=yes
+CONFIG_RV34DSP=yes
 CONFIG_SINEWIN=yes
+CONFIG_SNAPPY=yes
 CONFIG_STARTCODE=yes
+CONFIG_TEXTUREDSP=yes
+!CONFIG_TEXTUREDSPENC=yes
 CONFIG_TPELDSP=yes
 CONFIG_VIDEODSP=yes
 CONFIG_VP3DSP=yes
+CONFIG_VP56DSP=yes
+CONFIG_VP8DSP=yes
 CONFIG_WMA_FREQS=yes
+CONFIG_WMV2DSP=yes
 CONFIG_AAC_ADTSTOASC_BSF=yes
 CONFIG_CHOMP_BSF=yes
 CONFIG_DUMP_EXTRADATA_BSF=yes
 CONFIG_H264_MP4TOANNEXB_BSF=yes
+CONFIG_HEVC_MP4TOANNEXB_BSF=yes
 CONFIG_IMX_DUMP_HEADER_BSF=yes
 CONFIG_MJPEG2JPEG_BSF=yes
 CONFIG_MJPEGA_DUMP_HEADER_BSF=yes
@@ -762,6 +791,7 @@ CONFIG_COMFORTNOISE_DECODER=yes
 CONFIG_CPIA_DECODER=yes
 CONFIG_CSCD_DECODER=yes
 CONFIG_CYUV_DECODER=yes
+CONFIG_DDS_DECODER=yes
 CONFIG_DFA_DECODER=yes
 CONFIG_DIRAC_DECODER=yes
 CONFIG_DNXHD_DECODER=yes
@@ -803,7 +833,9 @@ CONFIG_H264_DECODER=yes
 !CONFIG_H264_QSV_DECODER=yes
 !CONFIG_H264_VDA_DECODER=yes
 !CONFIG_H264_VDPAU_DECODER=yes
+CONFIG_HAP_DECODER=yes
 CONFIG_HEVC_DECODER=yes
+!CONFIG_HEVC_QSV_DECODER=yes
 CONFIG_HNM4_VIDEO_DECODER=yes
 CONFIG_HQ_HQA_DECODER=yes
 CONFIG_HQX_DECODER=yes
@@ -839,6 +871,7 @@ CONFIG_MPEGVIDEO_DECODER=yes
 !CONFIG_MPEG_VDPAU_DECODER=yes
 !CONFIG_MPEG1_VDPAU_DECODER=yes
 !CONFIG_MPEG2_CRYSTALHD_DECODER=yes
+!CONFIG_MPEG2_QSV_DECODER=yes
 CONFIG_MSA1_DECODER=yes
 !CONFIG_MSMPEG4_CRYSTALHD_DECODER=yes
 CONFIG_MSMPEG4V1_DECODER=yes
@@ -917,6 +950,7 @@ CONFIG_VC1_DECODER=yes
 !CONFIG_VC1_CRYSTALHD_DECODER=yes
 !CONFIG_VC1_VDPAU_DECODER=yes
 CONFIG_VC1IMAGE_DECODER=yes
+!CONFIG_VC1_QSV_DECODER=yes
 CONFIG_VCR1_DECODER=yes
 CONFIG_VMDVIDEO_DECODER=yes
 CONFIG_VMNC_DECODER=yes
@@ -951,6 +985,7 @@ CONFIG_ZEROCODEC_DECODER=yes
 CONFIG_ZLIB_DECODER=yes
 CONFIG_ZMBV_DECODER=yes
 CONFIG_AAC_DECODER=yes
+CONFIG_AAC_FIXED_DECODER=yes
 CONFIG_AAC_LATM_DECODER=yes
 CONFIG_AC3_DECODER=yes
 CONFIG_AC3_FIXED_DECODER=yes
@@ -1093,6 +1128,7 @@ CONFIG_ADPCM_SBPRO_3_DECODER=yes
 CONFIG_ADPCM_SBPRO_4_DECODER=yes
 CONFIG_ADPCM_SWF_DECODER=yes
 CONFIG_ADPCM_THP_DECODER=yes
+CONFIG_ADPCM_THP_LE_DECODER=yes
 CONFIG_ADPCM_VIMA_DECODER=yes
 CONFIG_ADPCM_XA_DECODER=yes
 CONFIG_ADPCM_YAMAHA_DECODER=yes
@@ -1140,6 +1176,7 @@ CONFIG_XSUB_DECODER=yes
 CONFIG_BINTEXT_DECODER=yes
 CONFIG_XBIN_DECODER=yes
 CONFIG_IDF_DECODER=yes
+CONFIG_AA_DEMUXER=yes
 CONFIG_AAC_DEMUXER=yes
 CONFIG_AC3_DEMUXER=yes
 CONFIG_ACT_DEMUXER=yes
@@ -1156,6 +1193,7 @@ CONFIG_APE_DEMUXER=yes
 CONFIG_APNG_DEMUXER=yes
 CONFIG_AQTITLE_DEMUXER=yes
 CONFIG_ASF_DEMUXER=yes
+CONFIG_ASF_O_DEMUXER=yes
 CONFIG_ASS_DEMUXER=yes
 CONFIG_AST_DEMUXER=yes
 CONFIG_AU_DEMUXER=yes
@@ -1169,6 +1207,7 @@ CONFIG_BINTEXT_DEMUXER=yes
 CONFIG_BINK_DEMUXER=yes
 CONFIG_BIT_DEMUXER=yes
 CONFIG_BMV_DEMUXER=yes
+CONFIG_BFSTM_DEMUXER=yes
 CONFIG_BRSTM_DEMUXER=yes
 CONFIG_BOA_DEMUXER=yes
 CONFIG_C93_DEMUXER=yes
@@ -1365,6 +1404,7 @@ CONFIG_XWMA_DEMUXER=yes
 CONFIG_YOP_DEMUXER=yes
 CONFIG_YUV4MPEGPIPE_DEMUXER=yes
 CONFIG_IMAGE_BMP_PIPE_DEMUXER=yes
+CONFIG_IMAGE_DDS_PIPE_DEMUXER=yes
 CONFIG_IMAGE_DPX_PIPE_DEMUXER=yes
 CONFIG_IMAGE_EXR_PIPE_DEMUXER=yes
 CONFIG_IMAGE_J2K_PIPE_DEMUXER=yes
@@ -1407,6 +1447,7 @@ CONFIG_GIF_ENCODER=yes
 CONFIG_H261_ENCODER=yes
 CONFIG_H263_ENCODER=yes
 CONFIG_H263P_ENCODER=yes
+!CONFIG_HAP_ENCODER=yes
 CONFIG_HUFFYUV_ENCODER=yes
 CONFIG_JPEG2000_ENCODER=yes
 CONFIG_JPEGLS_ENCODER=yes
@@ -1542,6 +1583,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_LIBWAVPACK_ENCODER=yes
 !CONFIG_LIBWEBP_ANIM_ENCODER=yes
 !CONFIG_LIBWEBP_ENCODER=yes
+!CONFIG_LIBX262_ENCODER=yes
 !CONFIG_LIBX264_ENCODER=yes
 !CONFIG_LIBX264RGB_ENCODER=yes
 !CONFIG_LIBX265_ENCODER=yes
@@ -1553,6 +1595,10 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_NVENC_ENCODER=yes
 !CONFIG_NVENC_H264_ENCODER=yes
 !CONFIG_NVENC_HEVC_ENCODER=yes
+!CONFIG_HEVC_QSV_ENCODER=yes
+!CONFIG_LIBKVAZAAR_ENCODER=yes
+!CONFIG_MPEG2_QSV_ENCODER=yes
+!CONFIG_ACROSSFADE_FILTER=yes
 !CONFIG_ADELAY_FILTER=yes
 !CONFIG_AECHO_FILTER=yes
 !CONFIG_AEVAL_FILTER=yes
@@ -1567,6 +1613,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_APERMS_FILTER=yes
 !CONFIG_APHASER_FILTER=yes
 !CONFIG_ARESAMPLE_FILTER=yes
+!CONFIG_AREVERSE_FILTER=yes
 !CONFIG_ASELECT_FILTER=yes
 !CONFIG_ASENDCMD_FILTER=yes
 !CONFIG_ASETNSAMPLES_FILTER=yes
@@ -1591,6 +1638,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_CHORUS_FILTER=yes
 !CONFIG_COMPAND_FILTER=yes
 !CONFIG_DCSHIFT_FILTER=yes
+!CONFIG_DYNAUDNORM_FILTER=yes
 !CONFIG_EARWAX_FILTER=yes
 !CONFIG_EBUR128_FILTER=yes
 !CONFIG_EQUALIZER_FILTER=yes
@@ -1602,6 +1650,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_PAN_FILTER=yes
 !CONFIG_REPLAYGAIN_FILTER=yes
 !CONFIG_RESAMPLE_FILTER=yes
+!CONFIG_SIDECHAINCOMPRESS_FILTER=yes
 !CONFIG_SILENCEDETECT_FILTER=yes
 !CONFIG_SILENCEREMOVE_FILTER=yes
 !CONFIG_TREBLE_FILTER=yes
@@ -1614,6 +1663,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_ANULLSINK_FILTER=yes
 !CONFIG_ALPHAEXTRACT_FILTER=yes
 !CONFIG_ALPHAMERGE_FILTER=yes
+!CONFIG_ATADENOISE_FILTER=yes
 !CONFIG_ASS_FILTER=yes
 !CONFIG_BBOX_FILTER=yes
 !CONFIG_BLACKDETECT_FILTER=yes
@@ -1623,6 +1673,7 @@ CONFIG_XSUB_ENCODER=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_COPY_FILTER=yes
@@ -1631,17 +1682,22 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_CROPDETECT_FILTER=yes
 !CONFIG_CURVES_FILTER=yes
 !CONFIG_DCTDNOIZ_FILTER=yes
+!CONFIG_DEBAND_FILTER=yes
 !CONFIG_DECIMATE_FILTER=yes
+!CONFIG_DEFLATE_FILTER=yes
 !CONFIG_DEJUDDER_FILTER=yes
 !CONFIG_DELOGO_FILTER=yes
 !CONFIG_DESHAKE_FILTER=yes
 !CONFIG_DETELECINE_FILTER=yes
+!CONFIG_DILATION_FILTER=yes
 !CONFIG_DRAWBOX_FILTER=yes
+!CONFIG_DRAWGRAPH_FILTER=yes
 !CONFIG_DRAWGRID_FILTER=yes
 !CONFIG_DRAWTEXT_FILTER=yes
 !CONFIG_EDGEDETECT_FILTER=yes
 !CONFIG_ELBG_FILTER=yes
 !CONFIG_EQ_FILTER=yes
+!CONFIG_EROSION_FILTER=yes
 !CONFIG_EXTRACTPLANES_FILTER=yes
 !CONFIG_FADE_FILTER=yes
 !CONFIG_FFTFILT_FILTER=yes
@@ -1652,6 +1708,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_FORMAT_FILTER=yes
 !CONFIG_FPS_FILTER=yes
 !CONFIG_FRAMEPACK_FILTER=yes
+!CONFIG_FRAMERATE_FILTER=yes
 !CONFIG_FRAMESTEP_FILTER=yes
 !CONFIG_FREI0R_FILTER=yes
 !CONFIG_FSPP_FILTER=yes
@@ -1663,9 +1720,11 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_HISTOGRAM_FILTER=yes
 !CONFIG_HQDN3D_FILTER=yes
 !CONFIG_HQX_FILTER=yes
+!CONFIG_HSTACK_FILTER=yes
 !CONFIG_HUE_FILTER=yes
 !CONFIG_IDET_FILTER=yes
 !CONFIG_IL_FILTER=yes
+!CONFIG_INFLATE_FILTER=yes
 !CONFIG_INTERLACE_FILTER=yes
 !CONFIG_INTERLEAVE_FILTER=yes
 !CONFIG_KERNDEINT_FILTER=yes
@@ -1696,11 +1755,15 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_PSNR_FILTER=yes
 !CONFIG_PULLUP_FILTER=yes
 !CONFIG_QP_FILTER=yes
+!CONFIG_RANDOM_FILTER=yes
+!CONFIG_REMOVEGRAIN_FILTER=yes
 !CONFIG_REMOVELOGO_FILTER=yes
 !CONFIG_REPEATFIELDS_FILTER=yes
+!CONFIG_REVERSE_FILTER=yes
 !CONFIG_ROTATE_FILTER=yes
 !CONFIG_SAB_FILTER=yes
 !CONFIG_SCALE_FILTER=yes
+!CONFIG_SCALE2REF_FILTER=yes
 !CONFIG_SELECT_FILTER=yes
 !CONFIG_SENDCMD_FILTER=yes
 !CONFIG_SEPARATEFIELDS_FILTER=yes
@@ -1716,6 +1779,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_SMARTBLUR_FILTER=yes
 !CONFIG_SPLIT_FILTER=yes
 !CONFIG_SPP_FILTER=yes
+!CONFIG_SSIM_FILTER=yes
 !CONFIG_STEREO3D_FILTER=yes
 !CONFIG_SUBTITLES_FILTER=yes
 !CONFIG_SUPER2XSAI_FILTER=yes
@@ -1729,15 +1793,20 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_TRIM_FILTER=yes
 !CONFIG_UNSHARP_FILTER=yes
 !CONFIG_USPP_FILTER=yes
+!CONFIG_VECTORSCOPE_FILTER=yes
 !CONFIG_VFLIP_FILTER=yes
 !CONFIG_VIDSTABDETECT_FILTER=yes
 !CONFIG_VIDSTABTRANSFORM_FILTER=yes
 !CONFIG_VIGNETTE_FILTER=yes
+!CONFIG_VSTACK_FILTER=yes
 !CONFIG_W3FDIF_FILTER=yes
+!CONFIG_WAVEFORM_FILTER=yes
 !CONFIG_XBR_FILTER=yes
 !CONFIG_YADIF_FILTER=yes
 !CONFIG_ZMQ_FILTER=yes
 !CONFIG_ZOOMPAN_FILTER=yes
+!CONFIG_ALLRGB_FILTER=yes
+!CONFIG_ALLYUV_FILTER=yes
 !CONFIG_CELLAUTO_FILTER=yes
 !CONFIG_COLOR_FILTER=yes
 !CONFIG_FREI0R_SRC_FILTER=yes
@@ -1751,16 +1820,21 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_SMPTEHDBARS_FILTER=yes
 !CONFIG_TESTSRC_FILTER=yes
 !CONFIG_NULLSINK_FILTER=yes
+!CONFIG_ADRAWGRAPH_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_SHOWVOLUME_FILTER=yes
 !CONFIG_SHOWWAVES_FILTER=yes
 !CONFIG_SHOWWAVESPIC_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
 !CONFIG_H264_MMAL_HWACCEL=yes
@@ -1769,21 +1843,30 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_H264_VDA_HWACCEL=yes
 !CONFIG_H264_VDA_OLD_HWACCEL=yes
 !CONFIG_H264_VDPAU_HWACCEL=yes
+!CONFIG_H264_VIDEOTOOLBOX_HWACCEL=yes
 !CONFIG_HEVC_D3D11VA_HWACCEL=yes
 !CONFIG_HEVC_DXVA2_HWACCEL=yes
+!CONFIG_HEVC_QSV_HWACCEL=yes
+!CONFIG_HEVC_VAAPI_HWACCEL=yes
+!CONFIG_HEVC_VDPAU_HWACCEL=yes
 !CONFIG_MPEG1_XVMC_HWACCEL=yes
 !CONFIG_MPEG1_VDPAU_HWACCEL=yes
+!CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL=yes
 !CONFIG_MPEG2_XVMC_HWACCEL=yes
 !CONFIG_MPEG2_D3D11VA_HWACCEL=yes
 !CONFIG_MPEG2_DXVA2_HWACCEL=yes
+!CONFIG_MPEG2_QSV_HWACCEL=yes
 !CONFIG_MPEG2_VAAPI_HWACCEL=yes
 !CONFIG_MPEG2_VDPAU_HWACCEL=yes
+!CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL=yes
 !CONFIG_MPEG4_VAAPI_HWACCEL=yes
 !CONFIG_MPEG4_VDPAU_HWACCEL=yes
+!CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL=yes
 !CONFIG_VC1_D3D11VA_HWACCEL=yes
 !CONFIG_VC1_DXVA2_HWACCEL=yes
 !CONFIG_VC1_VAAPI_HWACCEL=yes
 !CONFIG_VC1_VDPAU_HWACCEL=yes
+!CONFIG_VC1_QSV_HWACCEL=yes
 !CONFIG_WMV3_D3D11VA_HWACCEL=yes
 !CONFIG_WMV3_DXVA2_HWACCEL=yes
 !CONFIG_WMV3_VAAPI_HWACCEL=yes
@@ -1980,6 +2063,7 @@ CONFIG_DVBSUB_PARSER=yes
 CONFIG_DVDSUB_PARSER=yes
 CONFIG_DVD_NAV_PARSER=yes
 CONFIG_FLAC_PARSER=yes
+CONFIG_G729_PARSER=yes
 CONFIG_GSM_PARSER=yes
 CONFIG_H261_PARSER=yes
 CONFIG_H263_PARSER=yes
@@ -2001,6 +2085,7 @@ CONFIG_VORBIS_PARSER=yes
 CONFIG_VP3_PARSER=yes
 CONFIG_VP8_PARSER=yes
 CONFIG_VP9_PARSER=yes
+CONFIG_ASYNC_PROTOCOL=yes
 !CONFIG_BLURAY_PROTOCOL=yes
 CONFIG_CACHE_PROTOCOL=yes
 CONFIG_CONCAT_PROTOCOL=yes
diff --git a/android/config-x86.mak b/android/config-x86.mak
index a24b473659..918182f40d 100644
--- a/android/config-x86.mak
+++ b/android/config-x86.mak
@@ -1,7 +1,7 @@
 # Automatically generated by configure - do not modify!
 ifndef FFMPEG_CONFIG_MAK
 FFMPEG_CONFIG_MAK=1
-FFMPEG_CONFIGURATION=--arch=x86 --cpu=i686 --build_suffix= --cross-prefix=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.8/bin/x86_64-linux-android- --enable-cross-compile --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-x86 --target-os=linux --extra-cflags=-m32 --disable-static --enable-shared --enable-optimizations --disable-doc --disable-symver --disable-ffmpeg --disable-ffplay --disable-ffprobe --disable-ffserver --disable-avdevice --disable-devices --disable-filters --disable-demuxer=srt --disable-demuxer=microdvd --disable-demuxer=jacosub --disable-demuxer=sami --disable-demuxer=realtext --disable-demuxer=dts --disable-demuxer=subviewer --disable-demuxer=subviewer1 --disable-demuxer=pjs --disable-demuxer=vplayer --disable-demuxer=mpl2 --disable-decoder=ass --disable-decoder=srt --disable-decoder=subrip --disable-decoder=microdvd --disable-decoder=jacosub --disable-decoder=sami --disable-decoder=realtext --disable-decoder=movtext --disable-decoder=subviewer --disable-decoder=subviewer1 --disable-decoder=pjs --disable-decoder=vplayer --disable-decoder=mpl2 --enable-zlib --enable-pic --disable-debug
+FFMPEG_CONFIGURATION=--arch=x86 --cpu=i686 --build_suffix= --cross-prefix=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android- --enable-cross-compile --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-x86 --target-os=linux --extra-cflags=-m32 --disable-static --enable-shared --enable-optimizations --disable-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
 prefix=/usr/local
 LIBDIR=$(DESTDIR)${prefix}/lib
 SHLIBDIR=$(DESTDIR)${prefix}/lib
@@ -15,24 +15,24 @@ SRC_PATH=.
 ifndef MAIN_MAKEFILE
 SRC_PATH:=$(SRC_PATH:.%=..%)
 endif
-CC_IDENT=gcc 4.8 (GCC)
+CC_IDENT=gcc 4.9 (GCC) 20140827 (prerelease)
 ARCH=x86
 INTRINSICS=none
-CC=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.8/bin/x86_64-linux-android-gcc
-CXX=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.8/bin/x86_64-linux-android-g++
-AS=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.8/bin/x86_64-linux-android-gcc
-LD=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.8/bin/x86_64-linux-android-gcc
-DEPCC=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.8/bin/x86_64-linux-android-gcc
+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
+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)
-DEPAS=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.8/bin/x86_64-linux-android-gcc
+DEPAS=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android-gcc
 DEPASFLAGS= $(CPPFLAGS)
 YASM=yasm
 DEPYASM=yasm
-AR=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.8/bin/x86_64-linux-android-ar
+AR=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android-ar
 ARFLAGS=rcD
 AR_O=$@
-RANLIB=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.8/bin/x86_64-linux-android-ranlib -D
-STRIP=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.8/bin/x86_64-linux-android-strip
+RANLIB=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android-ranlib -D
+STRIP=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android-strip
 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
@@ -50,11 +50,12 @@ LD_O=-o $@
 LD_LIB=-l%
 LD_PATH=-L
 DLLTOOL=
-WINDRES=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.8/bin/x86_64-linux-android-windres
-DEPWINDRES=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.8/bin/x86_64-linux-android-gcc
+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
 LDEXEFLAGS=
+LDLIBFLAGS=
 SHFLAGS=-shared -Wl,-soname,$$(@F) -Wl,-Bsymbolic -Wl,--version-script,$(SUBDIR)lib$(NAME).ver
 ASMSTRIPFLAGS= -wN '..@*'
 YASMFLAGS=-f elf  -DPIC
@@ -68,13 +69,13 @@ SLIBPREF=lib
 SLIBSUF=.so
 EXESUF=
 EXTRA_VERSION=
-CCDEP=
+CCDEP=$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< | sed -e "/^\#.*/d" -e "s,^[[:space:]]*$(*F)\\.o,$(@D)/$(*F).o," > $(@:.o=.d)
 CXXDEP=
-CCDEP_FLAGS=
-ASDEP=
-ASDEP_FLAGS=
-CC_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@
-AS_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@
+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=
 HOSTCC=gcc
 HOSTLD=gcc
 HOSTCFLAGS=  -std=c99 -Wall -O3
@@ -84,9 +85,9 @@ HOSTLDFLAGS=
 HOSTLIBS=-lm
 DEPHOSTCC=gcc
 DEPHOSTCCFLAGS= $(HOSTCCFLAGS)
-HOSTCCDEP=
-HOSTCCDEP_FLAGS=
-HOSTCC_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@
+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=
 HOSTCC_C=-c
 HOSTCC_O=-o $@
 HOSTLD_O=-o $@
@@ -112,28 +113,28 @@ SLIB_INSTALL_EXTRA_LIB=
 SLIB_INSTALL_EXTRA_SHLIB=
 SAMPLES:=$(FATE_SAMPLES)
 NOREDZONE_FLAGS=-mno-red-zone
-libavcodec_VERSION=56.41.100
+libavcodec_VERSION=56.60.100
 libavcodec_VERSION_MAJOR=56
-libavcodec_VERSION_MINOR=41
+libavcodec_VERSION_MINOR=60
 libavdevice_VERSION=56.4.100
 libavdevice_VERSION_MAJOR=56
 libavdevice_VERSION_MINOR=4
-libavfilter_VERSION=5.16.101
+libavfilter_VERSION=5.40.101
 libavfilter_VERSION_MAJOR=5
-libavfilter_VERSION_MINOR=16
-libavformat_VERSION=56.36.100
+libavfilter_VERSION_MINOR=40
+libavformat_VERSION=56.40.101
 libavformat_VERSION_MAJOR=56
-libavformat_VERSION_MINOR=36
+libavformat_VERSION_MINOR=40
 libavresample_VERSION=2.1.0
 libavresample_VERSION_MAJOR=2
 libavresample_VERSION_MINOR=1
-libavutil_VERSION=54.27.100
+libavutil_VERSION=54.31.100
 libavutil_VERSION_MAJOR=54
-libavutil_VERSION_MINOR=27
+libavutil_VERSION_MINOR=31
 libpostproc_VERSION=53.3.100
 libpostproc_VERSION_MAJOR=53
 libpostproc_VERSION_MINOR=3
-libswresample_VERSION=1.2.100
+libswresample_VERSION=1.2.101
 libswresample_VERSION_MAJOR=1
 libswresample_VERSION_MINOR=2
 libswscale_VERSION=3.1.101
@@ -214,7 +215,9 @@ HAVE_I686=yes
 !HAVE_MIPSDSPR1=yes
 !HAVE_MIPSDSPR2=yes
 !HAVE_MSA=yes
-!HAVE_LOONGSON3=yes
+HAVE_LOONGSON2=yes
+HAVE_LOONGSON3=yes
+!HAVE_MMI=yes
 !HAVE_ARMV5TE_EXTERNAL=yes
 !HAVE_ARMV6_EXTERNAL=yes
 !HAVE_ARMV6T2_EXTERNAL=yes
@@ -253,7 +256,9 @@ HAVE_XOP_EXTERNAL=yes
 !HAVE_MIPSDSPR1_EXTERNAL=yes
 !HAVE_MIPSDSPR2_EXTERNAL=yes
 !HAVE_MSA_EXTERNAL=yes
+!HAVE_LOONGSON2_EXTERNAL=yes
 !HAVE_LOONGSON3_EXTERNAL=yes
+!HAVE_MMI_EXTERNAL=yes
 !HAVE_ARMV5TE_INLINE=yes
 !HAVE_ARMV6_INLINE=yes
 !HAVE_ARMV6T2_INLINE=yes
@@ -292,7 +297,9 @@ HAVE_XOP_INLINE=yes
 !HAVE_MIPSDSPR1_INLINE=yes
 !HAVE_MIPSDSPR2_INLINE=yes
 !HAVE_MSA_INLINE=yes
+!HAVE_LOONGSON2_INLINE=yes
 !HAVE_LOONGSON3_INLINE=yes
+!HAVE_MMI_INLINE=yes
 HAVE_ALIGNED_STACK=yes
 !HAVE_FAST_64BIT=yes
 HAVE_FAST_CLZ=yes
@@ -330,6 +337,7 @@ HAVE_ASM_TYPES_H=yes
 !HAVE_DEV_VIDEO_BKTR_IOCTL_BT848_H=yes
 !HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H=yes
 !HAVE_DIRECT_H=yes
+HAVE_DIRENT_H=yes
 HAVE_DLFCN_H=yes
 !HAVE_D3D11_H=yes
 !HAVE_DXVA_H=yes
@@ -364,7 +372,9 @@ HAVE_ATANF=yes
 HAVE_ATAN2F=yes
 HAVE_CBRT=yes
 HAVE_CBRTF=yes
+HAVE_COPYSIGN=yes
 HAVE_COSF=yes
+HAVE_ERF=yes
 HAVE_EXP2=yes
 HAVE_EXP2F=yes
 HAVE_EXPF=yes
@@ -414,6 +424,7 @@ HAVE_ISATTY=yes
 !HAVE_JACK_PORT_GET_LATENCY_RANGE=yes
 !HAVE_KBHIT=yes
 HAVE_LOCALTIME_R=yes
+HAVE_LSTAT=yes
 !HAVE_LZO1X_999_COMPRESS=yes
 !HAVE_MACH_ABSOLUTE_TIME=yes
 !HAVE_MAPVIEWOFFILE=yes
@@ -427,6 +438,7 @@ HAVE_POSIX_MEMALIGN=yes
 !HAVE_PTHREAD_CANCEL=yes
 HAVE_SCHED_GETAFFINITY=yes
 !HAVE_SETCONSOLETEXTATTRIBUTE=yes
+!HAVE_SETCONSOLECTRLHANDLER=yes
 !HAVE_SETMODE=yes
 HAVE_SETRLIMIT=yes
 !HAVE_SLEEP=yes
@@ -463,6 +475,7 @@ 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
@@ -509,7 +522,7 @@ CONFIG_MANPAGES=yes
 CONFIG_PODPAGES=yes
 !CONFIG_TXTPAGES=yes
 CONFIG_AVIO_READING_EXAMPLE=yes
-CONFIG_AVIO_LIST_DIR_EXAMPLE=yes
+CONFIG_AVIO_DIR_CMD_EXAMPLE=yes
 CONFIG_DECODING_ENCODING_EXAMPLE=yes
 CONFIG_DEMUXING_DECODING_EXAMPLE=yes
 CONFIG_EXTRACT_MVS_EXAMPLE=yes
@@ -551,6 +564,7 @@ CONFIG_TRANSCODING_EXAMPLE=yes
 !CONFIG_LIBGSM=yes
 !CONFIG_LIBIEC61883=yes
 !CONFIG_LIBILBC=yes
+!CONFIG_LIBKVAZAAR=yes
 !CONFIG_LIBMFX=yes
 !CONFIG_LIBMODPLUG=yes
 !CONFIG_LIBMP3LAME=yes
@@ -567,6 +581,7 @@ CONFIG_TRANSCODING_EXAMPLE=yes
 !CONFIG_LIBSCHROEDINGER=yes
 !CONFIG_LIBSHINE=yes
 !CONFIG_LIBSMBCLIENT=yes
+!CONFIG_LIBSNAPPY=yes
 !CONFIG_LIBSOXR=yes
 !CONFIG_LIBSPEEX=yes
 !CONFIG_LIBSSH=yes
@@ -618,6 +633,7 @@ CONFIG_SWSCALE_ALPHA=yes
 !CONFIG_VAAPI=yes
 !CONFIG_VDA=yes
 !CONFIG_VDPAU=yes
+!CONFIG_VIDEOTOOLBOX=yes
 !CONFIG_XVMC=yes
 !CONFIG_GPL=yes
 !CONFIG_NONFREE=yes
@@ -670,8 +686,10 @@ CONFIG_EXIF=yes
 CONFIG_FAANDCT=yes
 CONFIG_FAANIDCT=yes
 CONFIG_FDCTDSP=yes
+CONFIG_FLACDSP=yes
 CONFIG_FMTCONVERT=yes
 CONFIG_FRAME_THREAD_ENCODER=yes
+CONFIG_G722DSP=yes
 !CONFIG_GCRYPT=yes
 !CONFIG_GMP=yes
 CONFIG_GOLOMB=yes
@@ -689,7 +707,9 @@ CONFIG_IDCTDSP=yes
 CONFIG_IIRFILTER=yes
 CONFIG_IMDCT15=yes
 CONFIG_INTRAX8=yes
+CONFIG_IVIDSP=yes
 CONFIG_JPEGTABLES=yes
+!CONFIG_LIBX262=yes
 !CONFIG_LGPLV3=yes
 CONFIG_LLAUDDSP=yes
 CONFIG_LLVIDDSP=yes
@@ -700,6 +720,7 @@ CONFIG_MPEGAUDIO=yes
 CONFIG_MPEGAUDIODSP=yes
 CONFIG_MPEGVIDEO=yes
 CONFIG_MPEGVIDEOENC=yes
+CONFIG_MSS34DSP=yes
 CONFIG_PIXBLOCKDSP=yes
 CONFIG_QPELDSP=yes
 !CONFIG_QSV=yes
@@ -710,16 +731,24 @@ CONFIG_RIFFDEC=yes
 CONFIG_RIFFENC=yes
 CONFIG_RTPDEC=yes
 CONFIG_RTPENC_CHAIN=yes
+CONFIG_RV34DSP=yes
 CONFIG_SINEWIN=yes
+CONFIG_SNAPPY=yes
 CONFIG_STARTCODE=yes
+CONFIG_TEXTUREDSP=yes
+!CONFIG_TEXTUREDSPENC=yes
 CONFIG_TPELDSP=yes
 CONFIG_VIDEODSP=yes
 CONFIG_VP3DSP=yes
+CONFIG_VP56DSP=yes
+CONFIG_VP8DSP=yes
 CONFIG_WMA_FREQS=yes
+CONFIG_WMV2DSP=yes
 CONFIG_AAC_ADTSTOASC_BSF=yes
 CONFIG_CHOMP_BSF=yes
 CONFIG_DUMP_EXTRADATA_BSF=yes
 CONFIG_H264_MP4TOANNEXB_BSF=yes
+CONFIG_HEVC_MP4TOANNEXB_BSF=yes
 CONFIG_IMX_DUMP_HEADER_BSF=yes
 CONFIG_MJPEG2JPEG_BSF=yes
 CONFIG_MJPEGA_DUMP_HEADER_BSF=yes
@@ -762,6 +791,7 @@ CONFIG_COMFORTNOISE_DECODER=yes
 CONFIG_CPIA_DECODER=yes
 CONFIG_CSCD_DECODER=yes
 CONFIG_CYUV_DECODER=yes
+CONFIG_DDS_DECODER=yes
 CONFIG_DFA_DECODER=yes
 CONFIG_DIRAC_DECODER=yes
 CONFIG_DNXHD_DECODER=yes
@@ -803,7 +833,9 @@ CONFIG_H264_DECODER=yes
 !CONFIG_H264_QSV_DECODER=yes
 !CONFIG_H264_VDA_DECODER=yes
 !CONFIG_H264_VDPAU_DECODER=yes
+CONFIG_HAP_DECODER=yes
 CONFIG_HEVC_DECODER=yes
+!CONFIG_HEVC_QSV_DECODER=yes
 CONFIG_HNM4_VIDEO_DECODER=yes
 CONFIG_HQ_HQA_DECODER=yes
 CONFIG_HQX_DECODER=yes
@@ -839,6 +871,7 @@ CONFIG_MPEGVIDEO_DECODER=yes
 !CONFIG_MPEG_VDPAU_DECODER=yes
 !CONFIG_MPEG1_VDPAU_DECODER=yes
 !CONFIG_MPEG2_CRYSTALHD_DECODER=yes
+!CONFIG_MPEG2_QSV_DECODER=yes
 CONFIG_MSA1_DECODER=yes
 !CONFIG_MSMPEG4_CRYSTALHD_DECODER=yes
 CONFIG_MSMPEG4V1_DECODER=yes
@@ -917,6 +950,7 @@ CONFIG_VC1_DECODER=yes
 !CONFIG_VC1_CRYSTALHD_DECODER=yes
 !CONFIG_VC1_VDPAU_DECODER=yes
 CONFIG_VC1IMAGE_DECODER=yes
+!CONFIG_VC1_QSV_DECODER=yes
 CONFIG_VCR1_DECODER=yes
 CONFIG_VMDVIDEO_DECODER=yes
 CONFIG_VMNC_DECODER=yes
@@ -951,6 +985,7 @@ CONFIG_ZEROCODEC_DECODER=yes
 CONFIG_ZLIB_DECODER=yes
 CONFIG_ZMBV_DECODER=yes
 CONFIG_AAC_DECODER=yes
+CONFIG_AAC_FIXED_DECODER=yes
 CONFIG_AAC_LATM_DECODER=yes
 CONFIG_AC3_DECODER=yes
 CONFIG_AC3_FIXED_DECODER=yes
@@ -1093,6 +1128,7 @@ CONFIG_ADPCM_SBPRO_3_DECODER=yes
 CONFIG_ADPCM_SBPRO_4_DECODER=yes
 CONFIG_ADPCM_SWF_DECODER=yes
 CONFIG_ADPCM_THP_DECODER=yes
+CONFIG_ADPCM_THP_LE_DECODER=yes
 CONFIG_ADPCM_VIMA_DECODER=yes
 CONFIG_ADPCM_XA_DECODER=yes
 CONFIG_ADPCM_YAMAHA_DECODER=yes
@@ -1140,6 +1176,7 @@ CONFIG_XSUB_DECODER=yes
 CONFIG_BINTEXT_DECODER=yes
 CONFIG_XBIN_DECODER=yes
 CONFIG_IDF_DECODER=yes
+CONFIG_AA_DEMUXER=yes
 CONFIG_AAC_DEMUXER=yes
 CONFIG_AC3_DEMUXER=yes
 CONFIG_ACT_DEMUXER=yes
@@ -1156,6 +1193,7 @@ CONFIG_APE_DEMUXER=yes
 CONFIG_APNG_DEMUXER=yes
 CONFIG_AQTITLE_DEMUXER=yes
 CONFIG_ASF_DEMUXER=yes
+CONFIG_ASF_O_DEMUXER=yes
 CONFIG_ASS_DEMUXER=yes
 CONFIG_AST_DEMUXER=yes
 CONFIG_AU_DEMUXER=yes
@@ -1169,6 +1207,7 @@ CONFIG_BINTEXT_DEMUXER=yes
 CONFIG_BINK_DEMUXER=yes
 CONFIG_BIT_DEMUXER=yes
 CONFIG_BMV_DEMUXER=yes
+CONFIG_BFSTM_DEMUXER=yes
 CONFIG_BRSTM_DEMUXER=yes
 CONFIG_BOA_DEMUXER=yes
 CONFIG_C93_DEMUXER=yes
@@ -1365,6 +1404,7 @@ CONFIG_XWMA_DEMUXER=yes
 CONFIG_YOP_DEMUXER=yes
 CONFIG_YUV4MPEGPIPE_DEMUXER=yes
 CONFIG_IMAGE_BMP_PIPE_DEMUXER=yes
+CONFIG_IMAGE_DDS_PIPE_DEMUXER=yes
 CONFIG_IMAGE_DPX_PIPE_DEMUXER=yes
 CONFIG_IMAGE_EXR_PIPE_DEMUXER=yes
 CONFIG_IMAGE_J2K_PIPE_DEMUXER=yes
@@ -1407,6 +1447,7 @@ CONFIG_GIF_ENCODER=yes
 CONFIG_H261_ENCODER=yes
 CONFIG_H263_ENCODER=yes
 CONFIG_H263P_ENCODER=yes
+!CONFIG_HAP_ENCODER=yes
 CONFIG_HUFFYUV_ENCODER=yes
 CONFIG_JPEG2000_ENCODER=yes
 CONFIG_JPEGLS_ENCODER=yes
@@ -1542,6 +1583,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_LIBWAVPACK_ENCODER=yes
 !CONFIG_LIBWEBP_ANIM_ENCODER=yes
 !CONFIG_LIBWEBP_ENCODER=yes
+!CONFIG_LIBX262_ENCODER=yes
 !CONFIG_LIBX264_ENCODER=yes
 !CONFIG_LIBX264RGB_ENCODER=yes
 !CONFIG_LIBX265_ENCODER=yes
@@ -1553,6 +1595,10 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_NVENC_ENCODER=yes
 !CONFIG_NVENC_H264_ENCODER=yes
 !CONFIG_NVENC_HEVC_ENCODER=yes
+!CONFIG_HEVC_QSV_ENCODER=yes
+!CONFIG_LIBKVAZAAR_ENCODER=yes
+!CONFIG_MPEG2_QSV_ENCODER=yes
+!CONFIG_ACROSSFADE_FILTER=yes
 !CONFIG_ADELAY_FILTER=yes
 !CONFIG_AECHO_FILTER=yes
 !CONFIG_AEVAL_FILTER=yes
@@ -1567,6 +1613,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_APERMS_FILTER=yes
 !CONFIG_APHASER_FILTER=yes
 !CONFIG_ARESAMPLE_FILTER=yes
+!CONFIG_AREVERSE_FILTER=yes
 !CONFIG_ASELECT_FILTER=yes
 !CONFIG_ASENDCMD_FILTER=yes
 !CONFIG_ASETNSAMPLES_FILTER=yes
@@ -1591,6 +1638,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_CHORUS_FILTER=yes
 !CONFIG_COMPAND_FILTER=yes
 !CONFIG_DCSHIFT_FILTER=yes
+!CONFIG_DYNAUDNORM_FILTER=yes
 !CONFIG_EARWAX_FILTER=yes
 !CONFIG_EBUR128_FILTER=yes
 !CONFIG_EQUALIZER_FILTER=yes
@@ -1602,6 +1650,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_PAN_FILTER=yes
 !CONFIG_REPLAYGAIN_FILTER=yes
 !CONFIG_RESAMPLE_FILTER=yes
+!CONFIG_SIDECHAINCOMPRESS_FILTER=yes
 !CONFIG_SILENCEDETECT_FILTER=yes
 !CONFIG_SILENCEREMOVE_FILTER=yes
 !CONFIG_TREBLE_FILTER=yes
@@ -1614,6 +1663,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_ANULLSINK_FILTER=yes
 !CONFIG_ALPHAEXTRACT_FILTER=yes
 !CONFIG_ALPHAMERGE_FILTER=yes
+!CONFIG_ATADENOISE_FILTER=yes
 !CONFIG_ASS_FILTER=yes
 !CONFIG_BBOX_FILTER=yes
 !CONFIG_BLACKDETECT_FILTER=yes
@@ -1623,6 +1673,7 @@ CONFIG_XSUB_ENCODER=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_COPY_FILTER=yes
@@ -1631,17 +1682,22 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_CROPDETECT_FILTER=yes
 !CONFIG_CURVES_FILTER=yes
 !CONFIG_DCTDNOIZ_FILTER=yes
+!CONFIG_DEBAND_FILTER=yes
 !CONFIG_DECIMATE_FILTER=yes
+!CONFIG_DEFLATE_FILTER=yes
 !CONFIG_DEJUDDER_FILTER=yes
 !CONFIG_DELOGO_FILTER=yes
 !CONFIG_DESHAKE_FILTER=yes
 !CONFIG_DETELECINE_FILTER=yes
+!CONFIG_DILATION_FILTER=yes
 !CONFIG_DRAWBOX_FILTER=yes
+!CONFIG_DRAWGRAPH_FILTER=yes
 !CONFIG_DRAWGRID_FILTER=yes
 !CONFIG_DRAWTEXT_FILTER=yes
 !CONFIG_EDGEDETECT_FILTER=yes
 !CONFIG_ELBG_FILTER=yes
 !CONFIG_EQ_FILTER=yes
+!CONFIG_EROSION_FILTER=yes
 !CONFIG_EXTRACTPLANES_FILTER=yes
 !CONFIG_FADE_FILTER=yes
 !CONFIG_FFTFILT_FILTER=yes
@@ -1652,6 +1708,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_FORMAT_FILTER=yes
 !CONFIG_FPS_FILTER=yes
 !CONFIG_FRAMEPACK_FILTER=yes
+!CONFIG_FRAMERATE_FILTER=yes
 !CONFIG_FRAMESTEP_FILTER=yes
 !CONFIG_FREI0R_FILTER=yes
 !CONFIG_FSPP_FILTER=yes
@@ -1663,9 +1720,11 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_HISTOGRAM_FILTER=yes
 !CONFIG_HQDN3D_FILTER=yes
 !CONFIG_HQX_FILTER=yes
+!CONFIG_HSTACK_FILTER=yes
 !CONFIG_HUE_FILTER=yes
 !CONFIG_IDET_FILTER=yes
 !CONFIG_IL_FILTER=yes
+!CONFIG_INFLATE_FILTER=yes
 !CONFIG_INTERLACE_FILTER=yes
 !CONFIG_INTERLEAVE_FILTER=yes
 !CONFIG_KERNDEINT_FILTER=yes
@@ -1696,11 +1755,15 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_PSNR_FILTER=yes
 !CONFIG_PULLUP_FILTER=yes
 !CONFIG_QP_FILTER=yes
+!CONFIG_RANDOM_FILTER=yes
+!CONFIG_REMOVEGRAIN_FILTER=yes
 !CONFIG_REMOVELOGO_FILTER=yes
 !CONFIG_REPEATFIELDS_FILTER=yes
+!CONFIG_REVERSE_FILTER=yes
 !CONFIG_ROTATE_FILTER=yes
 !CONFIG_SAB_FILTER=yes
 !CONFIG_SCALE_FILTER=yes
+!CONFIG_SCALE2REF_FILTER=yes
 !CONFIG_SELECT_FILTER=yes
 !CONFIG_SENDCMD_FILTER=yes
 !CONFIG_SEPARATEFIELDS_FILTER=yes
@@ -1716,6 +1779,7 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_SMARTBLUR_FILTER=yes
 !CONFIG_SPLIT_FILTER=yes
 !CONFIG_SPP_FILTER=yes
+!CONFIG_SSIM_FILTER=yes
 !CONFIG_STEREO3D_FILTER=yes
 !CONFIG_SUBTITLES_FILTER=yes
 !CONFIG_SUPER2XSAI_FILTER=yes
@@ -1729,15 +1793,20 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_TRIM_FILTER=yes
 !CONFIG_UNSHARP_FILTER=yes
 !CONFIG_USPP_FILTER=yes
+!CONFIG_VECTORSCOPE_FILTER=yes
 !CONFIG_VFLIP_FILTER=yes
 !CONFIG_VIDSTABDETECT_FILTER=yes
 !CONFIG_VIDSTABTRANSFORM_FILTER=yes
 !CONFIG_VIGNETTE_FILTER=yes
+!CONFIG_VSTACK_FILTER=yes
 !CONFIG_W3FDIF_FILTER=yes
+!CONFIG_WAVEFORM_FILTER=yes
 !CONFIG_XBR_FILTER=yes
 !CONFIG_YADIF_FILTER=yes
 !CONFIG_ZMQ_FILTER=yes
 !CONFIG_ZOOMPAN_FILTER=yes
+!CONFIG_ALLRGB_FILTER=yes
+!CONFIG_ALLYUV_FILTER=yes
 !CONFIG_CELLAUTO_FILTER=yes
 !CONFIG_COLOR_FILTER=yes
 !CONFIG_FREI0R_SRC_FILTER=yes
@@ -1751,16 +1820,21 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_SMPTEHDBARS_FILTER=yes
 !CONFIG_TESTSRC_FILTER=yes
 !CONFIG_NULLSINK_FILTER=yes
+!CONFIG_ADRAWGRAPH_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_SHOWVOLUME_FILTER=yes
 !CONFIG_SHOWWAVES_FILTER=yes
 !CONFIG_SHOWWAVESPIC_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
 !CONFIG_H264_MMAL_HWACCEL=yes
@@ -1769,21 +1843,30 @@ CONFIG_XSUB_ENCODER=yes
 !CONFIG_H264_VDA_HWACCEL=yes
 !CONFIG_H264_VDA_OLD_HWACCEL=yes
 !CONFIG_H264_VDPAU_HWACCEL=yes
+!CONFIG_H264_VIDEOTOOLBOX_HWACCEL=yes
 !CONFIG_HEVC_D3D11VA_HWACCEL=yes
 !CONFIG_HEVC_DXVA2_HWACCEL=yes
+!CONFIG_HEVC_QSV_HWACCEL=yes
+!CONFIG_HEVC_VAAPI_HWACCEL=yes
+!CONFIG_HEVC_VDPAU_HWACCEL=yes
 !CONFIG_MPEG1_XVMC_HWACCEL=yes
 !CONFIG_MPEG1_VDPAU_HWACCEL=yes
+!CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL=yes
 !CONFIG_MPEG2_XVMC_HWACCEL=yes
 !CONFIG_MPEG2_D3D11VA_HWACCEL=yes
 !CONFIG_MPEG2_DXVA2_HWACCEL=yes
+!CONFIG_MPEG2_QSV_HWACCEL=yes
 !CONFIG_MPEG2_VAAPI_HWACCEL=yes
 !CONFIG_MPEG2_VDPAU_HWACCEL=yes
+!CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL=yes
 !CONFIG_MPEG4_VAAPI_HWACCEL=yes
 !CONFIG_MPEG4_VDPAU_HWACCEL=yes
+!CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL=yes
 !CONFIG_VC1_D3D11VA_HWACCEL=yes
 !CONFIG_VC1_DXVA2_HWACCEL=yes
 !CONFIG_VC1_VAAPI_HWACCEL=yes
 !CONFIG_VC1_VDPAU_HWACCEL=yes
+!CONFIG_VC1_QSV_HWACCEL=yes
 !CONFIG_WMV3_D3D11VA_HWACCEL=yes
 !CONFIG_WMV3_DXVA2_HWACCEL=yes
 !CONFIG_WMV3_VAAPI_HWACCEL=yes
@@ -1980,6 +2063,7 @@ CONFIG_DVBSUB_PARSER=yes
 CONFIG_DVDSUB_PARSER=yes
 CONFIG_DVD_NAV_PARSER=yes
 CONFIG_FLAC_PARSER=yes
+CONFIG_G729_PARSER=yes
 CONFIG_GSM_PARSER=yes
 CONFIG_H261_PARSER=yes
 CONFIG_H263_PARSER=yes
@@ -2001,6 +2085,7 @@ CONFIG_VORBIS_PARSER=yes
 CONFIG_VP3_PARSER=yes
 CONFIG_VP8_PARSER=yes
 CONFIG_VP9_PARSER=yes
+CONFIG_ASYNC_PROTOCOL=yes
 !CONFIG_BLURAY_PROTOCOL=yes
 CONFIG_CACHE_PROTOCOL=yes
 CONFIG_CONCAT_PROTOCOL=yes
diff --git a/android/include/config-armv5te.h b/android/include/config-armv5te.h
index 5e0041ffda..3858fbbbe2 100644
--- a/android/include/config-armv5te.h
+++ b/android/include/config-armv5te.h
@@ -1,12 +1,12 @@
 /* Automatically generated by configure - do not modify! */
 #ifndef FFMPEG_CONFIG_H
 #define FFMPEG_CONFIG_H
-#define FFMPEG_CONFIGURATION "--arch=arm --cpu=armv5te --build_suffix= --cross-prefix=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8/bin/arm-linux-androideabi- --enable-cross-compile --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-arm --target-os=linux --disable-static --enable-shared --enable-optimizations --disable-doc --disable-symver --disable-ffmpeg --disable-ffplay --disable-ffprobe --disable-ffserver --disable-avdevice --disable-devices --disable-filters --disable-demuxer=srt --disable-demuxer=microdvd --disable-demuxer=jacosub --disable-demuxer=sami --disable-demuxer=realtext --disable-demuxer=dts --disable-demuxer=subviewer --disable-demuxer=subviewer1 --disable-demuxer=pjs --disable-demuxer=vplayer --disable-demuxer=mpl2 --disable-decoder=ass --disable-decoder=srt --disable-decoder=subrip --disable-decoder=microdvd --disable-decoder=jacosub --disable-decoder=sami --disable-decoder=realtext --disable-decoder=movtext --disable-decoder=subviewer --disable-decoder=subviewer1 --disable-decoder=pjs --disable-decoder=vplayer --disable-decoder=mpl2 --enable-zlib --enable-pic --disable-debug"
+#define FFMPEG_CONFIGURATION "--arch=arm --cpu=armv5te --build_suffix= --cross-prefix=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi- --enable-cross-compile --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-arm --target-os=linux --disable-static --enable-shared --enable-optimizations --disable-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 FFMPEG_DATADIR "/usr/local/share/ffmpeg"
 #define AVCONV_DATADIR "/usr/local/share/ffmpeg"
-#define CC_IDENT "gcc 4.8 (GCC)"
+#define CC_IDENT "gcc 4.9.x-google (GCC) 20140827 (prerelease)"
 #define av_restrict restrict
 #define EXTERN_PREFIX ""
 #define EXTERN_ASM 
@@ -265,10 +265,18 @@
 #undef HAVE_MSA
 #endif
 #define HAVE_MSA 0
+#ifdef HAVE_LOONGSON2
+#undef HAVE_LOONGSON2
+#endif
+#define HAVE_LOONGSON2 1
 #ifdef HAVE_LOONGSON3
 #undef HAVE_LOONGSON3
 #endif
-#define HAVE_LOONGSON3 0
+#define HAVE_LOONGSON3 1
+#ifdef HAVE_MMI
+#undef HAVE_MMI
+#endif
+#define HAVE_MMI 0
 #ifdef HAVE_ARMV5TE_EXTERNAL
 #undef HAVE_ARMV5TE_EXTERNAL
 #endif
@@ -421,10 +429,18 @@
 #undef HAVE_MSA_EXTERNAL
 #endif
 #define HAVE_MSA_EXTERNAL 0
+#ifdef HAVE_LOONGSON2_EXTERNAL
+#undef HAVE_LOONGSON2_EXTERNAL
+#endif
+#define HAVE_LOONGSON2_EXTERNAL 0
 #ifdef HAVE_LOONGSON3_EXTERNAL
 #undef HAVE_LOONGSON3_EXTERNAL
 #endif
 #define HAVE_LOONGSON3_EXTERNAL 0
+#ifdef HAVE_MMI_EXTERNAL
+#undef HAVE_MMI_EXTERNAL
+#endif
+#define HAVE_MMI_EXTERNAL 0
 #ifdef HAVE_ARMV5TE_INLINE
 #undef HAVE_ARMV5TE_INLINE
 #endif
@@ -577,10 +593,18 @@
 #undef HAVE_MSA_INLINE
 #endif
 #define HAVE_MSA_INLINE 0
+#ifdef HAVE_LOONGSON2_INLINE
+#undef HAVE_LOONGSON2_INLINE
+#endif
+#define HAVE_LOONGSON2_INLINE 0
 #ifdef HAVE_LOONGSON3_INLINE
 #undef HAVE_LOONGSON3_INLINE
 #endif
 #define HAVE_LOONGSON3_INLINE 0
+#ifdef HAVE_MMI_INLINE
+#undef HAVE_MMI_INLINE
+#endif
+#define HAVE_MMI_INLINE 0
 #ifdef HAVE_ALIGNED_STACK
 #undef HAVE_ALIGNED_STACK
 #endif
@@ -729,6 +753,10 @@
 #undef HAVE_DIRECT_H
 #endif
 #define HAVE_DIRECT_H 0
+#ifdef HAVE_DIRENT_H
+#undef HAVE_DIRENT_H
+#endif
+#define HAVE_DIRENT_H 1
 #ifdef HAVE_DLFCN_H
 #undef HAVE_DLFCN_H
 #endif
@@ -865,10 +893,18 @@
 #undef HAVE_CBRTF
 #endif
 #define HAVE_CBRTF 1
+#ifdef HAVE_COPYSIGN
+#undef HAVE_COPYSIGN
+#endif
+#define HAVE_COPYSIGN 1
 #ifdef HAVE_COSF
 #undef HAVE_COSF
 #endif
 #define HAVE_COSF 1
+#ifdef HAVE_ERF
+#undef HAVE_ERF
+#endif
+#define HAVE_ERF 1
 #ifdef HAVE_EXP2
 #undef HAVE_EXP2
 #endif
@@ -1065,6 +1101,10 @@
 #undef HAVE_LOCALTIME_R
 #endif
 #define HAVE_LOCALTIME_R 1
+#ifdef HAVE_LSTAT
+#undef HAVE_LSTAT
+#endif
+#define HAVE_LSTAT 1
 #ifdef HAVE_LZO1X_999_COMPRESS
 #undef HAVE_LZO1X_999_COMPRESS
 #endif
@@ -1117,6 +1157,10 @@
 #undef HAVE_SETCONSOLETEXTATTRIBUTE
 #endif
 #define HAVE_SETCONSOLETEXTATTRIBUTE 0
+#ifdef HAVE_SETCONSOLECTRLHANDLER
+#undef HAVE_SETCONSOLECTRLHANDLER
+#endif
+#define HAVE_SETCONSOLECTRLHANDLER 0
 #ifdef HAVE_SETMODE
 #undef HAVE_SETMODE
 #endif
@@ -1261,6 +1305,10 @@
 #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
@@ -1394,7 +1442,7 @@
 #define CONFIG_PODPAGES 1
 #define CONFIG_TXTPAGES 0
 #define CONFIG_AVIO_READING_EXAMPLE 1
-#define CONFIG_AVIO_LIST_DIR_EXAMPLE 1
+#define CONFIG_AVIO_DIR_CMD_EXAMPLE 1
 #define CONFIG_DECODING_ENCODING_EXAMPLE 1
 #define CONFIG_DEMUXING_DECODING_EXAMPLE 1
 #define CONFIG_EXTRACT_MVS_EXAMPLE 1
@@ -1436,6 +1484,7 @@
 #define CONFIG_LIBGSM 0
 #define CONFIG_LIBIEC61883 0
 #define CONFIG_LIBILBC 0
+#define CONFIG_LIBKVAZAAR 0
 #define CONFIG_LIBMFX 0
 #define CONFIG_LIBMODPLUG 0
 #define CONFIG_LIBMP3LAME 0
@@ -1452,6 +1501,7 @@
 #define CONFIG_LIBSCHROEDINGER 0
 #define CONFIG_LIBSHINE 0
 #define CONFIG_LIBSMBCLIENT 0
+#define CONFIG_LIBSNAPPY 0
 #define CONFIG_LIBSOXR 0
 #define CONFIG_LIBSPEEX 0
 #define CONFIG_LIBSSH 0
@@ -1503,6 +1553,7 @@
 #define CONFIG_VAAPI 0
 #define CONFIG_VDA 0
 #define CONFIG_VDPAU 0
+#define CONFIG_VIDEOTOOLBOX 0
 #define CONFIG_XVMC 0
 #define CONFIG_GPL 0
 #define CONFIG_NONFREE 0
@@ -1555,8 +1606,10 @@
 #define CONFIG_FAANDCT 1
 #define CONFIG_FAANIDCT 1
 #define CONFIG_FDCTDSP 1
+#define CONFIG_FLACDSP 1
 #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
@@ -1574,7 +1627,9 @@
 #define CONFIG_IIRFILTER 1
 #define CONFIG_IMDCT15 1
 #define CONFIG_INTRAX8 1
+#define CONFIG_IVIDSP 1
 #define CONFIG_JPEGTABLES 1
+#define CONFIG_LIBX262 0
 #define CONFIG_LGPLV3 0
 #define CONFIG_LLAUDDSP 1
 #define CONFIG_LLVIDDSP 1
@@ -1585,6 +1640,7 @@
 #define CONFIG_MPEGAUDIODSP 1
 #define CONFIG_MPEGVIDEO 1
 #define CONFIG_MPEGVIDEOENC 1
+#define CONFIG_MSS34DSP 1
 #define CONFIG_PIXBLOCKDSP 1
 #define CONFIG_QPELDSP 1
 #define CONFIG_QSV 0
@@ -1595,16 +1651,24 @@
 #define CONFIG_RIFFENC 1
 #define CONFIG_RTPDEC 1
 #define CONFIG_RTPENC_CHAIN 1
+#define CONFIG_RV34DSP 1
 #define CONFIG_SINEWIN 1
+#define CONFIG_SNAPPY 1
 #define CONFIG_STARTCODE 1
+#define CONFIG_TEXTUREDSP 1
+#define CONFIG_TEXTUREDSPENC 0
 #define CONFIG_TPELDSP 1
 #define CONFIG_VIDEODSP 1
 #define CONFIG_VP3DSP 1
+#define CONFIG_VP56DSP 1
+#define CONFIG_VP8DSP 1
 #define CONFIG_WMA_FREQS 1
+#define CONFIG_WMV2DSP 1
 #define CONFIG_AAC_ADTSTOASC_BSF 1
 #define CONFIG_CHOMP_BSF 1
 #define CONFIG_DUMP_EXTRADATA_BSF 1
 #define CONFIG_H264_MP4TOANNEXB_BSF 1
+#define CONFIG_HEVC_MP4TOANNEXB_BSF 1
 #define CONFIG_IMX_DUMP_HEADER_BSF 1
 #define CONFIG_MJPEG2JPEG_BSF 1
 #define CONFIG_MJPEGA_DUMP_HEADER_BSF 1
@@ -1647,6 +1711,7 @@
 #define CONFIG_CPIA_DECODER 1
 #define CONFIG_CSCD_DECODER 1
 #define CONFIG_CYUV_DECODER 1
+#define CONFIG_DDS_DECODER 1
 #define CONFIG_DFA_DECODER 1
 #define CONFIG_DIRAC_DECODER 1
 #define CONFIG_DNXHD_DECODER 1
@@ -1688,7 +1753,9 @@
 #define CONFIG_H264_QSV_DECODER 0
 #define CONFIG_H264_VDA_DECODER 0
 #define CONFIG_H264_VDPAU_DECODER 0
+#define CONFIG_HAP_DECODER 1
 #define CONFIG_HEVC_DECODER 1
+#define CONFIG_HEVC_QSV_DECODER 0
 #define CONFIG_HNM4_VIDEO_DECODER 1
 #define CONFIG_HQ_HQA_DECODER 1
 #define CONFIG_HQX_DECODER 1
@@ -1724,6 +1791,7 @@
 #define CONFIG_MPEG_VDPAU_DECODER 0
 #define CONFIG_MPEG1_VDPAU_DECODER 0
 #define CONFIG_MPEG2_CRYSTALHD_DECODER 0
+#define CONFIG_MPEG2_QSV_DECODER 0
 #define CONFIG_MSA1_DECODER 1
 #define CONFIG_MSMPEG4_CRYSTALHD_DECODER 0
 #define CONFIG_MSMPEG4V1_DECODER 1
@@ -1802,6 +1870,7 @@
 #define CONFIG_VC1_CRYSTALHD_DECODER 0
 #define CONFIG_VC1_VDPAU_DECODER 0
 #define CONFIG_VC1IMAGE_DECODER 1
+#define CONFIG_VC1_QSV_DECODER 0
 #define CONFIG_VCR1_DECODER 1
 #define CONFIG_VMDVIDEO_DECODER 1
 #define CONFIG_VMNC_DECODER 1
@@ -1836,6 +1905,7 @@
 #define CONFIG_ZLIB_DECODER 1
 #define CONFIG_ZMBV_DECODER 1
 #define CONFIG_AAC_DECODER 1
+#define CONFIG_AAC_FIXED_DECODER 1
 #define CONFIG_AAC_LATM_DECODER 1
 #define CONFIG_AC3_DECODER 1
 #define CONFIG_AC3_FIXED_DECODER 1
@@ -1978,6 +2048,7 @@
 #define CONFIG_ADPCM_SBPRO_4_DECODER 1
 #define CONFIG_ADPCM_SWF_DECODER 1
 #define CONFIG_ADPCM_THP_DECODER 1
+#define CONFIG_ADPCM_THP_LE_DECODER 1
 #define CONFIG_ADPCM_VIMA_DECODER 1
 #define CONFIG_ADPCM_XA_DECODER 1
 #define CONFIG_ADPCM_YAMAHA_DECODER 1
@@ -2025,6 +2096,7 @@
 #define CONFIG_BINTEXT_DECODER 1
 #define CONFIG_XBIN_DECODER 1
 #define CONFIG_IDF_DECODER 1
+#define CONFIG_AA_DEMUXER 1
 #define CONFIG_AAC_DEMUXER 1
 #define CONFIG_AC3_DEMUXER 1
 #define CONFIG_ACT_DEMUXER 1
@@ -2041,6 +2113,7 @@
 #define CONFIG_APNG_DEMUXER 1
 #define CONFIG_AQTITLE_DEMUXER 1
 #define CONFIG_ASF_DEMUXER 1
+#define CONFIG_ASF_O_DEMUXER 1
 #define CONFIG_ASS_DEMUXER 1
 #define CONFIG_AST_DEMUXER 1
 #define CONFIG_AU_DEMUXER 1
@@ -2054,6 +2127,7 @@
 #define CONFIG_BINK_DEMUXER 1
 #define CONFIG_BIT_DEMUXER 1
 #define CONFIG_BMV_DEMUXER 1
+#define CONFIG_BFSTM_DEMUXER 1
 #define CONFIG_BRSTM_DEMUXER 1
 #define CONFIG_BOA_DEMUXER 1
 #define CONFIG_C93_DEMUXER 1
@@ -2250,6 +2324,7 @@
 #define CONFIG_YOP_DEMUXER 1
 #define CONFIG_YUV4MPEGPIPE_DEMUXER 1
 #define CONFIG_IMAGE_BMP_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_DDS_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_DPX_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_EXR_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_J2K_PIPE_DEMUXER 1
@@ -2292,6 +2367,7 @@
 #define CONFIG_H261_ENCODER 1
 #define CONFIG_H263_ENCODER 1
 #define CONFIG_H263P_ENCODER 1
+#define CONFIG_HAP_ENCODER 0
 #define CONFIG_HUFFYUV_ENCODER 1
 #define CONFIG_JPEG2000_ENCODER 1
 #define CONFIG_JPEGLS_ENCODER 1
@@ -2427,6 +2503,7 @@
 #define CONFIG_LIBWAVPACK_ENCODER 0
 #define CONFIG_LIBWEBP_ANIM_ENCODER 0
 #define CONFIG_LIBWEBP_ENCODER 0
+#define CONFIG_LIBX262_ENCODER 0
 #define CONFIG_LIBX264_ENCODER 0
 #define CONFIG_LIBX264RGB_ENCODER 0
 #define CONFIG_LIBX265_ENCODER 0
@@ -2438,6 +2515,10 @@
 #define CONFIG_NVENC_ENCODER 0
 #define CONFIG_NVENC_H264_ENCODER 0
 #define CONFIG_NVENC_HEVC_ENCODER 0
+#define CONFIG_HEVC_QSV_ENCODER 0
+#define CONFIG_LIBKVAZAAR_ENCODER 0
+#define CONFIG_MPEG2_QSV_ENCODER 0
+#define CONFIG_ACROSSFADE_FILTER 0
 #define CONFIG_ADELAY_FILTER 0
 #define CONFIG_AECHO_FILTER 0
 #define CONFIG_AEVAL_FILTER 0
@@ -2452,6 +2533,7 @@
 #define CONFIG_APERMS_FILTER 0
 #define CONFIG_APHASER_FILTER 0
 #define CONFIG_ARESAMPLE_FILTER 0
+#define CONFIG_AREVERSE_FILTER 0
 #define CONFIG_ASELECT_FILTER 0
 #define CONFIG_ASENDCMD_FILTER 0
 #define CONFIG_ASETNSAMPLES_FILTER 0
@@ -2476,6 +2558,7 @@
 #define CONFIG_CHORUS_FILTER 0
 #define CONFIG_COMPAND_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
@@ -2487,6 +2570,7 @@
 #define CONFIG_PAN_FILTER 0
 #define CONFIG_REPLAYGAIN_FILTER 0
 #define CONFIG_RESAMPLE_FILTER 0
+#define CONFIG_SIDECHAINCOMPRESS_FILTER 0
 #define CONFIG_SILENCEDETECT_FILTER 0
 #define CONFIG_SILENCEREMOVE_FILTER 0
 #define CONFIG_TREBLE_FILTER 0
@@ -2499,6 +2583,7 @@
 #define CONFIG_ANULLSINK_FILTER 0
 #define CONFIG_ALPHAEXTRACT_FILTER 0
 #define CONFIG_ALPHAMERGE_FILTER 0
+#define CONFIG_ATADENOISE_FILTER 0
 #define CONFIG_ASS_FILTER 0
 #define CONFIG_BBOX_FILTER 0
 #define CONFIG_BLACKDETECT_FILTER 0
@@ -2508,6 +2593,7 @@
 #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_COPY_FILTER 0
@@ -2516,17 +2602,22 @@
 #define CONFIG_CROPDETECT_FILTER 0
 #define CONFIG_CURVES_FILTER 0
 #define CONFIG_DCTDNOIZ_FILTER 0
+#define CONFIG_DEBAND_FILTER 0
 #define CONFIG_DECIMATE_FILTER 0
+#define CONFIG_DEFLATE_FILTER 0
 #define CONFIG_DEJUDDER_FILTER 0
 #define CONFIG_DELOGO_FILTER 0
 #define CONFIG_DESHAKE_FILTER 0
 #define CONFIG_DETELECINE_FILTER 0
+#define CONFIG_DILATION_FILTER 0
 #define CONFIG_DRAWBOX_FILTER 0
+#define CONFIG_DRAWGRAPH_FILTER 0
 #define CONFIG_DRAWGRID_FILTER 0
 #define CONFIG_DRAWTEXT_FILTER 0
 #define CONFIG_EDGEDETECT_FILTER 0
 #define CONFIG_ELBG_FILTER 0
 #define CONFIG_EQ_FILTER 0
+#define CONFIG_EROSION_FILTER 0
 #define CONFIG_EXTRACTPLANES_FILTER 0
 #define CONFIG_FADE_FILTER 0
 #define CONFIG_FFTFILT_FILTER 0
@@ -2537,6 +2628,7 @@
 #define CONFIG_FORMAT_FILTER 0
 #define CONFIG_FPS_FILTER 0
 #define CONFIG_FRAMEPACK_FILTER 0
+#define CONFIG_FRAMERATE_FILTER 0
 #define CONFIG_FRAMESTEP_FILTER 0
 #define CONFIG_FREI0R_FILTER 0
 #define CONFIG_FSPP_FILTER 0
@@ -2548,9 +2640,11 @@
 #define CONFIG_HISTOGRAM_FILTER 0
 #define CONFIG_HQDN3D_FILTER 0
 #define CONFIG_HQX_FILTER 0
+#define CONFIG_HSTACK_FILTER 0
 #define CONFIG_HUE_FILTER 0
 #define CONFIG_IDET_FILTER 0
 #define CONFIG_IL_FILTER 0
+#define CONFIG_INFLATE_FILTER 0
 #define CONFIG_INTERLACE_FILTER 0
 #define CONFIG_INTERLEAVE_FILTER 0
 #define CONFIG_KERNDEINT_FILTER 0
@@ -2581,11 +2675,15 @@
 #define CONFIG_PSNR_FILTER 0
 #define CONFIG_PULLUP_FILTER 0
 #define CONFIG_QP_FILTER 0
+#define CONFIG_RANDOM_FILTER 0
+#define CONFIG_REMOVEGRAIN_FILTER 0
 #define CONFIG_REMOVELOGO_FILTER 0
 #define CONFIG_REPEATFIELDS_FILTER 0
+#define CONFIG_REVERSE_FILTER 0
 #define CONFIG_ROTATE_FILTER 0
 #define CONFIG_SAB_FILTER 0
 #define CONFIG_SCALE_FILTER 0
+#define CONFIG_SCALE2REF_FILTER 0
 #define CONFIG_SELECT_FILTER 0
 #define CONFIG_SENDCMD_FILTER 0
 #define CONFIG_SEPARATEFIELDS_FILTER 0
@@ -2601,6 +2699,7 @@
 #define CONFIG_SMARTBLUR_FILTER 0
 #define CONFIG_SPLIT_FILTER 0
 #define CONFIG_SPP_FILTER 0
+#define CONFIG_SSIM_FILTER 0
 #define CONFIG_STEREO3D_FILTER 0
 #define CONFIG_SUBTITLES_FILTER 0
 #define CONFIG_SUPER2XSAI_FILTER 0
@@ -2614,15 +2713,20 @@
 #define CONFIG_TRIM_FILTER 0
 #define CONFIG_UNSHARP_FILTER 0
 #define CONFIG_USPP_FILTER 0
+#define CONFIG_VECTORSCOPE_FILTER 0
 #define CONFIG_VFLIP_FILTER 0
 #define CONFIG_VIDSTABDETECT_FILTER 0
 #define CONFIG_VIDSTABTRANSFORM_FILTER 0
 #define CONFIG_VIGNETTE_FILTER 0
+#define CONFIG_VSTACK_FILTER 0
 #define CONFIG_W3FDIF_FILTER 0
+#define CONFIG_WAVEFORM_FILTER 0
 #define CONFIG_XBR_FILTER 0
 #define CONFIG_YADIF_FILTER 0
 #define CONFIG_ZMQ_FILTER 0
 #define CONFIG_ZOOMPAN_FILTER 0
+#define CONFIG_ALLRGB_FILTER 0
+#define CONFIG_ALLYUV_FILTER 0
 #define CONFIG_CELLAUTO_FILTER 0
 #define CONFIG_COLOR_FILTER 0
 #define CONFIG_FREI0R_SRC_FILTER 0
@@ -2636,16 +2740,21 @@
 #define CONFIG_SMPTEHDBARS_FILTER 0
 #define CONFIG_TESTSRC_FILTER 0
 #define CONFIG_NULLSINK_FILTER 0
+#define CONFIG_ADRAWGRAPH_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_SHOWVOLUME_FILTER 0
 #define CONFIG_SHOWWAVES_FILTER 0
 #define CONFIG_SHOWWAVESPIC_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
 #define CONFIG_H264_MMAL_HWACCEL 0
@@ -2654,21 +2763,30 @@
 #define CONFIG_H264_VDA_HWACCEL 0
 #define CONFIG_H264_VDA_OLD_HWACCEL 0
 #define CONFIG_H264_VDPAU_HWACCEL 0
+#define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0
 #define CONFIG_HEVC_D3D11VA_HWACCEL 0
 #define CONFIG_HEVC_DXVA2_HWACCEL 0
+#define CONFIG_HEVC_QSV_HWACCEL 0
+#define CONFIG_HEVC_VAAPI_HWACCEL 0
+#define CONFIG_HEVC_VDPAU_HWACCEL 0
 #define CONFIG_MPEG1_XVMC_HWACCEL 0
 #define CONFIG_MPEG1_VDPAU_HWACCEL 0
+#define CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL 0
 #define CONFIG_MPEG2_XVMC_HWACCEL 0
 #define CONFIG_MPEG2_D3D11VA_HWACCEL 0
 #define CONFIG_MPEG2_DXVA2_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_VAAPI_HWACCEL 0
 #define CONFIG_MPEG4_VDPAU_HWACCEL 0
+#define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
 #define CONFIG_VC1_D3D11VA_HWACCEL 0
 #define CONFIG_VC1_DXVA2_HWACCEL 0
 #define CONFIG_VC1_VAAPI_HWACCEL 0
 #define CONFIG_VC1_VDPAU_HWACCEL 0
+#define CONFIG_VC1_QSV_HWACCEL 0
 #define CONFIG_WMV3_D3D11VA_HWACCEL 0
 #define CONFIG_WMV3_DXVA2_HWACCEL 0
 #define CONFIG_WMV3_VAAPI_HWACCEL 0
@@ -2865,6 +2983,7 @@
 #define CONFIG_DVDSUB_PARSER 1
 #define CONFIG_DVD_NAV_PARSER 1
 #define CONFIG_FLAC_PARSER 1
+#define CONFIG_G729_PARSER 1
 #define CONFIG_GSM_PARSER 1
 #define CONFIG_H261_PARSER 1
 #define CONFIG_H263_PARSER 1
@@ -2886,6 +3005,7 @@
 #define CONFIG_VP3_PARSER 1
 #define CONFIG_VP8_PARSER 1
 #define CONFIG_VP9_PARSER 1
+#define CONFIG_ASYNC_PROTOCOL 1
 #define CONFIG_BLURAY_PROTOCOL 0
 #define CONFIG_CACHE_PROTOCOL 1
 #define CONFIG_CONCAT_PROTOCOL 1
diff --git a/android/include/config-armv7-a-neon.h b/android/include/config-armv7-a-neon.h
index 9cecdbfbc9..6a4bb17e75 100644
--- a/android/include/config-armv7-a-neon.h
+++ b/android/include/config-armv7-a-neon.h
@@ -1,12 +1,12 @@
 /* Automatically generated by configure - do not modify! */
 #ifndef FFMPEG_CONFIG_H
 #define FFMPEG_CONFIG_H
-#define FFMPEG_CONFIGURATION "--arch=arm --cpu=armv7-a --build_suffix= --cross-prefix=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8/bin/arm-linux-androideabi- --enable-cross-compile --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-arm --target-os=linux --disable-static --enable-shared --enable-optimizations --disable-doc --disable-symver --disable-ffmpeg --disable-ffplay --disable-ffprobe --disable-ffserver --disable-avdevice --disable-devices --disable-filters --disable-demuxer=srt --disable-demuxer=microdvd --disable-demuxer=jacosub --disable-demuxer=sami --disable-demuxer=realtext --disable-demuxer=dts --disable-demuxer=subviewer --disable-demuxer=subviewer1 --disable-demuxer=pjs --disable-demuxer=vplayer --disable-demuxer=mpl2 --disable-decoder=ass --disable-decoder=srt --disable-decoder=subrip --disable-decoder=microdvd --disable-decoder=jacosub --disable-decoder=sami --disable-decoder=realtext --disable-decoder=movtext --disable-decoder=subviewer --disable-decoder=subviewer1 --disable-decoder=pjs --disable-decoder=vplayer --disable-decoder=mpl2 --enable-zlib --enable-pic --disable-debug"
+#define FFMPEG_CONFIGURATION "--arch=arm --cpu=armv7-a --build_suffix= --cross-prefix=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi- --enable-cross-compile --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-arm --target-os=linux --disable-static --enable-shared --enable-optimizations --disable-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 FFMPEG_DATADIR "/usr/local/share/ffmpeg"
 #define AVCONV_DATADIR "/usr/local/share/ffmpeg"
-#define CC_IDENT "gcc 4.8 (GCC)"
+#define CC_IDENT "gcc 4.9.x-google (GCC) 20140827 (prerelease)"
 #define av_restrict restrict
 #define EXTERN_PREFIX ""
 #define EXTERN_ASM 
@@ -265,10 +265,18 @@
 #undef HAVE_MSA
 #endif
 #define HAVE_MSA 0
+#ifdef HAVE_LOONGSON2
+#undef HAVE_LOONGSON2
+#endif
+#define HAVE_LOONGSON2 1
 #ifdef HAVE_LOONGSON3
 #undef HAVE_LOONGSON3
 #endif
-#define HAVE_LOONGSON3 0
+#define HAVE_LOONGSON3 1
+#ifdef HAVE_MMI
+#undef HAVE_MMI
+#endif
+#define HAVE_MMI 0
 #ifdef HAVE_ARMV5TE_EXTERNAL
 #undef HAVE_ARMV5TE_EXTERNAL
 #endif
@@ -421,10 +429,18 @@
 #undef HAVE_MSA_EXTERNAL
 #endif
 #define HAVE_MSA_EXTERNAL 0
+#ifdef HAVE_LOONGSON2_EXTERNAL
+#undef HAVE_LOONGSON2_EXTERNAL
+#endif
+#define HAVE_LOONGSON2_EXTERNAL 0
 #ifdef HAVE_LOONGSON3_EXTERNAL
 #undef HAVE_LOONGSON3_EXTERNAL
 #endif
 #define HAVE_LOONGSON3_EXTERNAL 0
+#ifdef HAVE_MMI_EXTERNAL
+#undef HAVE_MMI_EXTERNAL
+#endif
+#define HAVE_MMI_EXTERNAL 0
 #ifdef HAVE_ARMV5TE_INLINE
 #undef HAVE_ARMV5TE_INLINE
 #endif
@@ -577,10 +593,18 @@
 #undef HAVE_MSA_INLINE
 #endif
 #define HAVE_MSA_INLINE 0
+#ifdef HAVE_LOONGSON2_INLINE
+#undef HAVE_LOONGSON2_INLINE
+#endif
+#define HAVE_LOONGSON2_INLINE 0
 #ifdef HAVE_LOONGSON3_INLINE
 #undef HAVE_LOONGSON3_INLINE
 #endif
 #define HAVE_LOONGSON3_INLINE 0
+#ifdef HAVE_MMI_INLINE
+#undef HAVE_MMI_INLINE
+#endif
+#define HAVE_MMI_INLINE 0
 #ifdef HAVE_ALIGNED_STACK
 #undef HAVE_ALIGNED_STACK
 #endif
@@ -729,6 +753,10 @@
 #undef HAVE_DIRECT_H
 #endif
 #define HAVE_DIRECT_H 0
+#ifdef HAVE_DIRENT_H
+#undef HAVE_DIRENT_H
+#endif
+#define HAVE_DIRENT_H 1
 #ifdef HAVE_DLFCN_H
 #undef HAVE_DLFCN_H
 #endif
@@ -865,10 +893,18 @@
 #undef HAVE_CBRTF
 #endif
 #define HAVE_CBRTF 1
+#ifdef HAVE_COPYSIGN
+#undef HAVE_COPYSIGN
+#endif
+#define HAVE_COPYSIGN 1
 #ifdef HAVE_COSF
 #undef HAVE_COSF
 #endif
 #define HAVE_COSF 1
+#ifdef HAVE_ERF
+#undef HAVE_ERF
+#endif
+#define HAVE_ERF 1
 #ifdef HAVE_EXP2
 #undef HAVE_EXP2
 #endif
@@ -1065,6 +1101,10 @@
 #undef HAVE_LOCALTIME_R
 #endif
 #define HAVE_LOCALTIME_R 1
+#ifdef HAVE_LSTAT
+#undef HAVE_LSTAT
+#endif
+#define HAVE_LSTAT 1
 #ifdef HAVE_LZO1X_999_COMPRESS
 #undef HAVE_LZO1X_999_COMPRESS
 #endif
@@ -1117,6 +1157,10 @@
 #undef HAVE_SETCONSOLETEXTATTRIBUTE
 #endif
 #define HAVE_SETCONSOLETEXTATTRIBUTE 0
+#ifdef HAVE_SETCONSOLECTRLHANDLER
+#undef HAVE_SETCONSOLECTRLHANDLER
+#endif
+#define HAVE_SETCONSOLECTRLHANDLER 0
 #ifdef HAVE_SETMODE
 #undef HAVE_SETMODE
 #endif
@@ -1261,6 +1305,10 @@
 #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
@@ -1394,7 +1442,7 @@
 #define CONFIG_PODPAGES 1
 #define CONFIG_TXTPAGES 0
 #define CONFIG_AVIO_READING_EXAMPLE 1
-#define CONFIG_AVIO_LIST_DIR_EXAMPLE 1
+#define CONFIG_AVIO_DIR_CMD_EXAMPLE 1
 #define CONFIG_DECODING_ENCODING_EXAMPLE 1
 #define CONFIG_DEMUXING_DECODING_EXAMPLE 1
 #define CONFIG_EXTRACT_MVS_EXAMPLE 1
@@ -1436,6 +1484,7 @@
 #define CONFIG_LIBGSM 0
 #define CONFIG_LIBIEC61883 0
 #define CONFIG_LIBILBC 0
+#define CONFIG_LIBKVAZAAR 0
 #define CONFIG_LIBMFX 0
 #define CONFIG_LIBMODPLUG 0
 #define CONFIG_LIBMP3LAME 0
@@ -1452,6 +1501,7 @@
 #define CONFIG_LIBSCHROEDINGER 0
 #define CONFIG_LIBSHINE 0
 #define CONFIG_LIBSMBCLIENT 0
+#define CONFIG_LIBSNAPPY 0
 #define CONFIG_LIBSOXR 0
 #define CONFIG_LIBSPEEX 0
 #define CONFIG_LIBSSH 0
@@ -1503,6 +1553,7 @@
 #define CONFIG_VAAPI 0
 #define CONFIG_VDA 0
 #define CONFIG_VDPAU 0
+#define CONFIG_VIDEOTOOLBOX 0
 #define CONFIG_XVMC 0
 #define CONFIG_GPL 0
 #define CONFIG_NONFREE 0
@@ -1555,8 +1606,10 @@
 #define CONFIG_FAANDCT 1
 #define CONFIG_FAANIDCT 1
 #define CONFIG_FDCTDSP 1
+#define CONFIG_FLACDSP 1
 #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
@@ -1574,7 +1627,9 @@
 #define CONFIG_IIRFILTER 1
 #define CONFIG_IMDCT15 1
 #define CONFIG_INTRAX8 1
+#define CONFIG_IVIDSP 1
 #define CONFIG_JPEGTABLES 1
+#define CONFIG_LIBX262 0
 #define CONFIG_LGPLV3 0
 #define CONFIG_LLAUDDSP 1
 #define CONFIG_LLVIDDSP 1
@@ -1585,6 +1640,7 @@
 #define CONFIG_MPEGAUDIODSP 1
 #define CONFIG_MPEGVIDEO 1
 #define CONFIG_MPEGVIDEOENC 1
+#define CONFIG_MSS34DSP 1
 #define CONFIG_PIXBLOCKDSP 1
 #define CONFIG_QPELDSP 1
 #define CONFIG_QSV 0
@@ -1595,16 +1651,24 @@
 #define CONFIG_RIFFENC 1
 #define CONFIG_RTPDEC 1
 #define CONFIG_RTPENC_CHAIN 1
+#define CONFIG_RV34DSP 1
 #define CONFIG_SINEWIN 1
+#define CONFIG_SNAPPY 1
 #define CONFIG_STARTCODE 1
+#define CONFIG_TEXTUREDSP 1
+#define CONFIG_TEXTUREDSPENC 0
 #define CONFIG_TPELDSP 1
 #define CONFIG_VIDEODSP 1
 #define CONFIG_VP3DSP 1
+#define CONFIG_VP56DSP 1
+#define CONFIG_VP8DSP 1
 #define CONFIG_WMA_FREQS 1
+#define CONFIG_WMV2DSP 1
 #define CONFIG_AAC_ADTSTOASC_BSF 1
 #define CONFIG_CHOMP_BSF 1
 #define CONFIG_DUMP_EXTRADATA_BSF 1
 #define CONFIG_H264_MP4TOANNEXB_BSF 1
+#define CONFIG_HEVC_MP4TOANNEXB_BSF 1
 #define CONFIG_IMX_DUMP_HEADER_BSF 1
 #define CONFIG_MJPEG2JPEG_BSF 1
 #define CONFIG_MJPEGA_DUMP_HEADER_BSF 1
@@ -1647,6 +1711,7 @@
 #define CONFIG_CPIA_DECODER 1
 #define CONFIG_CSCD_DECODER 1
 #define CONFIG_CYUV_DECODER 1
+#define CONFIG_DDS_DECODER 1
 #define CONFIG_DFA_DECODER 1
 #define CONFIG_DIRAC_DECODER 1
 #define CONFIG_DNXHD_DECODER 1
@@ -1688,7 +1753,9 @@
 #define CONFIG_H264_QSV_DECODER 0
 #define CONFIG_H264_VDA_DECODER 0
 #define CONFIG_H264_VDPAU_DECODER 0
+#define CONFIG_HAP_DECODER 1
 #define CONFIG_HEVC_DECODER 1
+#define CONFIG_HEVC_QSV_DECODER 0
 #define CONFIG_HNM4_VIDEO_DECODER 1
 #define CONFIG_HQ_HQA_DECODER 1
 #define CONFIG_HQX_DECODER 1
@@ -1724,6 +1791,7 @@
 #define CONFIG_MPEG_VDPAU_DECODER 0
 #define CONFIG_MPEG1_VDPAU_DECODER 0
 #define CONFIG_MPEG2_CRYSTALHD_DECODER 0
+#define CONFIG_MPEG2_QSV_DECODER 0
 #define CONFIG_MSA1_DECODER 1
 #define CONFIG_MSMPEG4_CRYSTALHD_DECODER 0
 #define CONFIG_MSMPEG4V1_DECODER 1
@@ -1802,6 +1870,7 @@
 #define CONFIG_VC1_CRYSTALHD_DECODER 0
 #define CONFIG_VC1_VDPAU_DECODER 0
 #define CONFIG_VC1IMAGE_DECODER 1
+#define CONFIG_VC1_QSV_DECODER 0
 #define CONFIG_VCR1_DECODER 1
 #define CONFIG_VMDVIDEO_DECODER 1
 #define CONFIG_VMNC_DECODER 1
@@ -1836,6 +1905,7 @@
 #define CONFIG_ZLIB_DECODER 1
 #define CONFIG_ZMBV_DECODER 1
 #define CONFIG_AAC_DECODER 1
+#define CONFIG_AAC_FIXED_DECODER 1
 #define CONFIG_AAC_LATM_DECODER 1
 #define CONFIG_AC3_DECODER 1
 #define CONFIG_AC3_FIXED_DECODER 1
@@ -1978,6 +2048,7 @@
 #define CONFIG_ADPCM_SBPRO_4_DECODER 1
 #define CONFIG_ADPCM_SWF_DECODER 1
 #define CONFIG_ADPCM_THP_DECODER 1
+#define CONFIG_ADPCM_THP_LE_DECODER 1
 #define CONFIG_ADPCM_VIMA_DECODER 1
 #define CONFIG_ADPCM_XA_DECODER 1
 #define CONFIG_ADPCM_YAMAHA_DECODER 1
@@ -2025,6 +2096,7 @@
 #define CONFIG_BINTEXT_DECODER 1
 #define CONFIG_XBIN_DECODER 1
 #define CONFIG_IDF_DECODER 1
+#define CONFIG_AA_DEMUXER 1
 #define CONFIG_AAC_DEMUXER 1
 #define CONFIG_AC3_DEMUXER 1
 #define CONFIG_ACT_DEMUXER 1
@@ -2041,6 +2113,7 @@
 #define CONFIG_APNG_DEMUXER 1
 #define CONFIG_AQTITLE_DEMUXER 1
 #define CONFIG_ASF_DEMUXER 1
+#define CONFIG_ASF_O_DEMUXER 1
 #define CONFIG_ASS_DEMUXER 1
 #define CONFIG_AST_DEMUXER 1
 #define CONFIG_AU_DEMUXER 1
@@ -2054,6 +2127,7 @@
 #define CONFIG_BINK_DEMUXER 1
 #define CONFIG_BIT_DEMUXER 1
 #define CONFIG_BMV_DEMUXER 1
+#define CONFIG_BFSTM_DEMUXER 1
 #define CONFIG_BRSTM_DEMUXER 1
 #define CONFIG_BOA_DEMUXER 1
 #define CONFIG_C93_DEMUXER 1
@@ -2250,6 +2324,7 @@
 #define CONFIG_YOP_DEMUXER 1
 #define CONFIG_YUV4MPEGPIPE_DEMUXER 1
 #define CONFIG_IMAGE_BMP_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_DDS_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_DPX_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_EXR_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_J2K_PIPE_DEMUXER 1
@@ -2292,6 +2367,7 @@
 #define CONFIG_H261_ENCODER 1
 #define CONFIG_H263_ENCODER 1
 #define CONFIG_H263P_ENCODER 1
+#define CONFIG_HAP_ENCODER 0
 #define CONFIG_HUFFYUV_ENCODER 1
 #define CONFIG_JPEG2000_ENCODER 1
 #define CONFIG_JPEGLS_ENCODER 1
@@ -2427,6 +2503,7 @@
 #define CONFIG_LIBWAVPACK_ENCODER 0
 #define CONFIG_LIBWEBP_ANIM_ENCODER 0
 #define CONFIG_LIBWEBP_ENCODER 0
+#define CONFIG_LIBX262_ENCODER 0
 #define CONFIG_LIBX264_ENCODER 0
 #define CONFIG_LIBX264RGB_ENCODER 0
 #define CONFIG_LIBX265_ENCODER 0
@@ -2438,6 +2515,10 @@
 #define CONFIG_NVENC_ENCODER 0
 #define CONFIG_NVENC_H264_ENCODER 0
 #define CONFIG_NVENC_HEVC_ENCODER 0
+#define CONFIG_HEVC_QSV_ENCODER 0
+#define CONFIG_LIBKVAZAAR_ENCODER 0
+#define CONFIG_MPEG2_QSV_ENCODER 0
+#define CONFIG_ACROSSFADE_FILTER 0
 #define CONFIG_ADELAY_FILTER 0
 #define CONFIG_AECHO_FILTER 0
 #define CONFIG_AEVAL_FILTER 0
@@ -2452,6 +2533,7 @@
 #define CONFIG_APERMS_FILTER 0
 #define CONFIG_APHASER_FILTER 0
 #define CONFIG_ARESAMPLE_FILTER 0
+#define CONFIG_AREVERSE_FILTER 0
 #define CONFIG_ASELECT_FILTER 0
 #define CONFIG_ASENDCMD_FILTER 0
 #define CONFIG_ASETNSAMPLES_FILTER 0
@@ -2476,6 +2558,7 @@
 #define CONFIG_CHORUS_FILTER 0
 #define CONFIG_COMPAND_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
@@ -2487,6 +2570,7 @@
 #define CONFIG_PAN_FILTER 0
 #define CONFIG_REPLAYGAIN_FILTER 0
 #define CONFIG_RESAMPLE_FILTER 0
+#define CONFIG_SIDECHAINCOMPRESS_FILTER 0
 #define CONFIG_SILENCEDETECT_FILTER 0
 #define CONFIG_SILENCEREMOVE_FILTER 0
 #define CONFIG_TREBLE_FILTER 0
@@ -2499,6 +2583,7 @@
 #define CONFIG_ANULLSINK_FILTER 0
 #define CONFIG_ALPHAEXTRACT_FILTER 0
 #define CONFIG_ALPHAMERGE_FILTER 0
+#define CONFIG_ATADENOISE_FILTER 0
 #define CONFIG_ASS_FILTER 0
 #define CONFIG_BBOX_FILTER 0
 #define CONFIG_BLACKDETECT_FILTER 0
@@ -2508,6 +2593,7 @@
 #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_COPY_FILTER 0
@@ -2516,17 +2602,22 @@
 #define CONFIG_CROPDETECT_FILTER 0
 #define CONFIG_CURVES_FILTER 0
 #define CONFIG_DCTDNOIZ_FILTER 0
+#define CONFIG_DEBAND_FILTER 0
 #define CONFIG_DECIMATE_FILTER 0
+#define CONFIG_DEFLATE_FILTER 0
 #define CONFIG_DEJUDDER_FILTER 0
 #define CONFIG_DELOGO_FILTER 0
 #define CONFIG_DESHAKE_FILTER 0
 #define CONFIG_DETELECINE_FILTER 0
+#define CONFIG_DILATION_FILTER 0
 #define CONFIG_DRAWBOX_FILTER 0
+#define CONFIG_DRAWGRAPH_FILTER 0
 #define CONFIG_DRAWGRID_FILTER 0
 #define CONFIG_DRAWTEXT_FILTER 0
 #define CONFIG_EDGEDETECT_FILTER 0
 #define CONFIG_ELBG_FILTER 0
 #define CONFIG_EQ_FILTER 0
+#define CONFIG_EROSION_FILTER 0
 #define CONFIG_EXTRACTPLANES_FILTER 0
 #define CONFIG_FADE_FILTER 0
 #define CONFIG_FFTFILT_FILTER 0
@@ -2537,6 +2628,7 @@
 #define CONFIG_FORMAT_FILTER 0
 #define CONFIG_FPS_FILTER 0
 #define CONFIG_FRAMEPACK_FILTER 0
+#define CONFIG_FRAMERATE_FILTER 0
 #define CONFIG_FRAMESTEP_FILTER 0
 #define CONFIG_FREI0R_FILTER 0
 #define CONFIG_FSPP_FILTER 0
@@ -2548,9 +2640,11 @@
 #define CONFIG_HISTOGRAM_FILTER 0
 #define CONFIG_HQDN3D_FILTER 0
 #define CONFIG_HQX_FILTER 0
+#define CONFIG_HSTACK_FILTER 0
 #define CONFIG_HUE_FILTER 0
 #define CONFIG_IDET_FILTER 0
 #define CONFIG_IL_FILTER 0
+#define CONFIG_INFLATE_FILTER 0
 #define CONFIG_INTERLACE_FILTER 0
 #define CONFIG_INTERLEAVE_FILTER 0
 #define CONFIG_KERNDEINT_FILTER 0
@@ -2581,11 +2675,15 @@
 #define CONFIG_PSNR_FILTER 0
 #define CONFIG_PULLUP_FILTER 0
 #define CONFIG_QP_FILTER 0
+#define CONFIG_RANDOM_FILTER 0
+#define CONFIG_REMOVEGRAIN_FILTER 0
 #define CONFIG_REMOVELOGO_FILTER 0
 #define CONFIG_REPEATFIELDS_FILTER 0
+#define CONFIG_REVERSE_FILTER 0
 #define CONFIG_ROTATE_FILTER 0
 #define CONFIG_SAB_FILTER 0
 #define CONFIG_SCALE_FILTER 0
+#define CONFIG_SCALE2REF_FILTER 0
 #define CONFIG_SELECT_FILTER 0
 #define CONFIG_SENDCMD_FILTER 0
 #define CONFIG_SEPARATEFIELDS_FILTER 0
@@ -2601,6 +2699,7 @@
 #define CONFIG_SMARTBLUR_FILTER 0
 #define CONFIG_SPLIT_FILTER 0
 #define CONFIG_SPP_FILTER 0
+#define CONFIG_SSIM_FILTER 0
 #define CONFIG_STEREO3D_FILTER 0
 #define CONFIG_SUBTITLES_FILTER 0
 #define CONFIG_SUPER2XSAI_FILTER 0
@@ -2614,15 +2713,20 @@
 #define CONFIG_TRIM_FILTER 0
 #define CONFIG_UNSHARP_FILTER 0
 #define CONFIG_USPP_FILTER 0
+#define CONFIG_VECTORSCOPE_FILTER 0
 #define CONFIG_VFLIP_FILTER 0
 #define CONFIG_VIDSTABDETECT_FILTER 0
 #define CONFIG_VIDSTABTRANSFORM_FILTER 0
 #define CONFIG_VIGNETTE_FILTER 0
+#define CONFIG_VSTACK_FILTER 0
 #define CONFIG_W3FDIF_FILTER 0
+#define CONFIG_WAVEFORM_FILTER 0
 #define CONFIG_XBR_FILTER 0
 #define CONFIG_YADIF_FILTER 0
 #define CONFIG_ZMQ_FILTER 0
 #define CONFIG_ZOOMPAN_FILTER 0
+#define CONFIG_ALLRGB_FILTER 0
+#define CONFIG_ALLYUV_FILTER 0
 #define CONFIG_CELLAUTO_FILTER 0
 #define CONFIG_COLOR_FILTER 0
 #define CONFIG_FREI0R_SRC_FILTER 0
@@ -2636,16 +2740,21 @@
 #define CONFIG_SMPTEHDBARS_FILTER 0
 #define CONFIG_TESTSRC_FILTER 0
 #define CONFIG_NULLSINK_FILTER 0
+#define CONFIG_ADRAWGRAPH_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_SHOWVOLUME_FILTER 0
 #define CONFIG_SHOWWAVES_FILTER 0
 #define CONFIG_SHOWWAVESPIC_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
 #define CONFIG_H264_MMAL_HWACCEL 0
@@ -2654,21 +2763,30 @@
 #define CONFIG_H264_VDA_HWACCEL 0
 #define CONFIG_H264_VDA_OLD_HWACCEL 0
 #define CONFIG_H264_VDPAU_HWACCEL 0
+#define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0
 #define CONFIG_HEVC_D3D11VA_HWACCEL 0
 #define CONFIG_HEVC_DXVA2_HWACCEL 0
+#define CONFIG_HEVC_QSV_HWACCEL 0
+#define CONFIG_HEVC_VAAPI_HWACCEL 0
+#define CONFIG_HEVC_VDPAU_HWACCEL 0
 #define CONFIG_MPEG1_XVMC_HWACCEL 0
 #define CONFIG_MPEG1_VDPAU_HWACCEL 0
+#define CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL 0
 #define CONFIG_MPEG2_XVMC_HWACCEL 0
 #define CONFIG_MPEG2_D3D11VA_HWACCEL 0
 #define CONFIG_MPEG2_DXVA2_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_VAAPI_HWACCEL 0
 #define CONFIG_MPEG4_VDPAU_HWACCEL 0
+#define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
 #define CONFIG_VC1_D3D11VA_HWACCEL 0
 #define CONFIG_VC1_DXVA2_HWACCEL 0
 #define CONFIG_VC1_VAAPI_HWACCEL 0
 #define CONFIG_VC1_VDPAU_HWACCEL 0
+#define CONFIG_VC1_QSV_HWACCEL 0
 #define CONFIG_WMV3_D3D11VA_HWACCEL 0
 #define CONFIG_WMV3_DXVA2_HWACCEL 0
 #define CONFIG_WMV3_VAAPI_HWACCEL 0
@@ -2865,6 +2983,7 @@
 #define CONFIG_DVDSUB_PARSER 1
 #define CONFIG_DVD_NAV_PARSER 1
 #define CONFIG_FLAC_PARSER 1
+#define CONFIG_G729_PARSER 1
 #define CONFIG_GSM_PARSER 1
 #define CONFIG_H261_PARSER 1
 #define CONFIG_H263_PARSER 1
@@ -2886,6 +3005,7 @@
 #define CONFIG_VP3_PARSER 1
 #define CONFIG_VP8_PARSER 1
 #define CONFIG_VP9_PARSER 1
+#define CONFIG_ASYNC_PROTOCOL 1
 #define CONFIG_BLURAY_PROTOCOL 0
 #define CONFIG_CACHE_PROTOCOL 1
 #define CONFIG_CONCAT_PROTOCOL 1
diff --git a/android/include/config-armv7-a.h b/android/include/config-armv7-a.h
index 9a93522ee9..2ffcc733b8 100644
--- a/android/include/config-armv7-a.h
+++ b/android/include/config-armv7-a.h
@@ -1,12 +1,12 @@
 /* Automatically generated by configure - do not modify! */
 #ifndef FFMPEG_CONFIG_H
 #define FFMPEG_CONFIG_H
-#define FFMPEG_CONFIGURATION "--arch=arm --disable-neon --cpu=armv7-a --build_suffix= --cross-prefix=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8/bin/arm-linux-androideabi- --enable-cross-compile --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-arm --target-os=linux --disable-static --enable-shared --enable-optimizations --disable-doc --disable-symver --disable-ffmpeg --disable-ffplay --disable-ffprobe --disable-ffserver --disable-avdevice --disable-devices --disable-filters --disable-demuxer=srt --disable-demuxer=microdvd --disable-demuxer=jacosub --disable-demuxer=sami --disable-demuxer=realtext --disable-demuxer=dts --disable-demuxer=subviewer --disable-demuxer=subviewer1 --disable-demuxer=pjs --disable-demuxer=vplayer --disable-demuxer=mpl2 --disable-decoder=ass --disable-decoder=srt --disable-decoder=subrip --disable-decoder=microdvd --disable-decoder=jacosub --disable-decoder=sami --disable-decoder=realtext --disable-decoder=movtext --disable-decoder=subviewer --disable-decoder=subviewer1 --disable-decoder=pjs --disable-decoder=vplayer --disable-decoder=mpl2 --enable-zlib --enable-pic --disable-debug"
+#define FFMPEG_CONFIGURATION "--arch=arm --disable-neon --cpu=armv7-a --build_suffix= --cross-prefix=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi- --enable-cross-compile --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-arm --target-os=linux --disable-static --enable-shared --enable-optimizations --disable-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 FFMPEG_DATADIR "/usr/local/share/ffmpeg"
 #define AVCONV_DATADIR "/usr/local/share/ffmpeg"
-#define CC_IDENT "gcc 4.8 (GCC)"
+#define CC_IDENT "gcc 4.9.x-google (GCC) 20140827 (prerelease)"
 #define av_restrict restrict
 #define EXTERN_PREFIX ""
 #define EXTERN_ASM 
@@ -265,10 +265,18 @@
 #undef HAVE_MSA
 #endif
 #define HAVE_MSA 0
+#ifdef HAVE_LOONGSON2
+#undef HAVE_LOONGSON2
+#endif
+#define HAVE_LOONGSON2 1
 #ifdef HAVE_LOONGSON3
 #undef HAVE_LOONGSON3
 #endif
-#define HAVE_LOONGSON3 0
+#define HAVE_LOONGSON3 1
+#ifdef HAVE_MMI
+#undef HAVE_MMI
+#endif
+#define HAVE_MMI 0
 #ifdef HAVE_ARMV5TE_EXTERNAL
 #undef HAVE_ARMV5TE_EXTERNAL
 #endif
@@ -421,10 +429,18 @@
 #undef HAVE_MSA_EXTERNAL
 #endif
 #define HAVE_MSA_EXTERNAL 0
+#ifdef HAVE_LOONGSON2_EXTERNAL
+#undef HAVE_LOONGSON2_EXTERNAL
+#endif
+#define HAVE_LOONGSON2_EXTERNAL 0
 #ifdef HAVE_LOONGSON3_EXTERNAL
 #undef HAVE_LOONGSON3_EXTERNAL
 #endif
 #define HAVE_LOONGSON3_EXTERNAL 0
+#ifdef HAVE_MMI_EXTERNAL
+#undef HAVE_MMI_EXTERNAL
+#endif
+#define HAVE_MMI_EXTERNAL 0
 #ifdef HAVE_ARMV5TE_INLINE
 #undef HAVE_ARMV5TE_INLINE
 #endif
@@ -577,10 +593,18 @@
 #undef HAVE_MSA_INLINE
 #endif
 #define HAVE_MSA_INLINE 0
+#ifdef HAVE_LOONGSON2_INLINE
+#undef HAVE_LOONGSON2_INLINE
+#endif
+#define HAVE_LOONGSON2_INLINE 0
 #ifdef HAVE_LOONGSON3_INLINE
 #undef HAVE_LOONGSON3_INLINE
 #endif
 #define HAVE_LOONGSON3_INLINE 0
+#ifdef HAVE_MMI_INLINE
+#undef HAVE_MMI_INLINE
+#endif
+#define HAVE_MMI_INLINE 0
 #ifdef HAVE_ALIGNED_STACK
 #undef HAVE_ALIGNED_STACK
 #endif
@@ -729,6 +753,10 @@
 #undef HAVE_DIRECT_H
 #endif
 #define HAVE_DIRECT_H 0
+#ifdef HAVE_DIRENT_H
+#undef HAVE_DIRENT_H
+#endif
+#define HAVE_DIRENT_H 1
 #ifdef HAVE_DLFCN_H
 #undef HAVE_DLFCN_H
 #endif
@@ -865,10 +893,18 @@
 #undef HAVE_CBRTF
 #endif
 #define HAVE_CBRTF 1
+#ifdef HAVE_COPYSIGN
+#undef HAVE_COPYSIGN
+#endif
+#define HAVE_COPYSIGN 1
 #ifdef HAVE_COSF
 #undef HAVE_COSF
 #endif
 #define HAVE_COSF 1
+#ifdef HAVE_ERF
+#undef HAVE_ERF
+#endif
+#define HAVE_ERF 1
 #ifdef HAVE_EXP2
 #undef HAVE_EXP2
 #endif
@@ -1065,6 +1101,10 @@
 #undef HAVE_LOCALTIME_R
 #endif
 #define HAVE_LOCALTIME_R 1
+#ifdef HAVE_LSTAT
+#undef HAVE_LSTAT
+#endif
+#define HAVE_LSTAT 1
 #ifdef HAVE_LZO1X_999_COMPRESS
 #undef HAVE_LZO1X_999_COMPRESS
 #endif
@@ -1117,6 +1157,10 @@
 #undef HAVE_SETCONSOLETEXTATTRIBUTE
 #endif
 #define HAVE_SETCONSOLETEXTATTRIBUTE 0
+#ifdef HAVE_SETCONSOLECTRLHANDLER
+#undef HAVE_SETCONSOLECTRLHANDLER
+#endif
+#define HAVE_SETCONSOLECTRLHANDLER 0
 #ifdef HAVE_SETMODE
 #undef HAVE_SETMODE
 #endif
@@ -1261,6 +1305,10 @@
 #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
@@ -1394,7 +1442,7 @@
 #define CONFIG_PODPAGES 1
 #define CONFIG_TXTPAGES 0
 #define CONFIG_AVIO_READING_EXAMPLE 1
-#define CONFIG_AVIO_LIST_DIR_EXAMPLE 1
+#define CONFIG_AVIO_DIR_CMD_EXAMPLE 1
 #define CONFIG_DECODING_ENCODING_EXAMPLE 1
 #define CONFIG_DEMUXING_DECODING_EXAMPLE 1
 #define CONFIG_EXTRACT_MVS_EXAMPLE 1
@@ -1436,6 +1484,7 @@
 #define CONFIG_LIBGSM 0
 #define CONFIG_LIBIEC61883 0
 #define CONFIG_LIBILBC 0
+#define CONFIG_LIBKVAZAAR 0
 #define CONFIG_LIBMFX 0
 #define CONFIG_LIBMODPLUG 0
 #define CONFIG_LIBMP3LAME 0
@@ -1452,6 +1501,7 @@
 #define CONFIG_LIBSCHROEDINGER 0
 #define CONFIG_LIBSHINE 0
 #define CONFIG_LIBSMBCLIENT 0
+#define CONFIG_LIBSNAPPY 0
 #define CONFIG_LIBSOXR 0
 #define CONFIG_LIBSPEEX 0
 #define CONFIG_LIBSSH 0
@@ -1503,6 +1553,7 @@
 #define CONFIG_VAAPI 0
 #define CONFIG_VDA 0
 #define CONFIG_VDPAU 0
+#define CONFIG_VIDEOTOOLBOX 0
 #define CONFIG_XVMC 0
 #define CONFIG_GPL 0
 #define CONFIG_NONFREE 0
@@ -1555,8 +1606,10 @@
 #define CONFIG_FAANDCT 1
 #define CONFIG_FAANIDCT 1
 #define CONFIG_FDCTDSP 1
+#define CONFIG_FLACDSP 1
 #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
@@ -1574,7 +1627,9 @@
 #define CONFIG_IIRFILTER 1
 #define CONFIG_IMDCT15 1
 #define CONFIG_INTRAX8 1
+#define CONFIG_IVIDSP 1
 #define CONFIG_JPEGTABLES 1
+#define CONFIG_LIBX262 0
 #define CONFIG_LGPLV3 0
 #define CONFIG_LLAUDDSP 1
 #define CONFIG_LLVIDDSP 1
@@ -1585,6 +1640,7 @@
 #define CONFIG_MPEGAUDIODSP 1
 #define CONFIG_MPEGVIDEO 1
 #define CONFIG_MPEGVIDEOENC 1
+#define CONFIG_MSS34DSP 1
 #define CONFIG_PIXBLOCKDSP 1
 #define CONFIG_QPELDSP 1
 #define CONFIG_QSV 0
@@ -1595,16 +1651,24 @@
 #define CONFIG_RIFFENC 1
 #define CONFIG_RTPDEC 1
 #define CONFIG_RTPENC_CHAIN 1
+#define CONFIG_RV34DSP 1
 #define CONFIG_SINEWIN 1
+#define CONFIG_SNAPPY 1
 #define CONFIG_STARTCODE 1
+#define CONFIG_TEXTUREDSP 1
+#define CONFIG_TEXTUREDSPENC 0
 #define CONFIG_TPELDSP 1
 #define CONFIG_VIDEODSP 1
 #define CONFIG_VP3DSP 1
+#define CONFIG_VP56DSP 1
+#define CONFIG_VP8DSP 1
 #define CONFIG_WMA_FREQS 1
+#define CONFIG_WMV2DSP 1
 #define CONFIG_AAC_ADTSTOASC_BSF 1
 #define CONFIG_CHOMP_BSF 1
 #define CONFIG_DUMP_EXTRADATA_BSF 1
 #define CONFIG_H264_MP4TOANNEXB_BSF 1
+#define CONFIG_HEVC_MP4TOANNEXB_BSF 1
 #define CONFIG_IMX_DUMP_HEADER_BSF 1
 #define CONFIG_MJPEG2JPEG_BSF 1
 #define CONFIG_MJPEGA_DUMP_HEADER_BSF 1
@@ -1647,6 +1711,7 @@
 #define CONFIG_CPIA_DECODER 1
 #define CONFIG_CSCD_DECODER 1
 #define CONFIG_CYUV_DECODER 1
+#define CONFIG_DDS_DECODER 1
 #define CONFIG_DFA_DECODER 1
 #define CONFIG_DIRAC_DECODER 1
 #define CONFIG_DNXHD_DECODER 1
@@ -1688,7 +1753,9 @@
 #define CONFIG_H264_QSV_DECODER 0
 #define CONFIG_H264_VDA_DECODER 0
 #define CONFIG_H264_VDPAU_DECODER 0
+#define CONFIG_HAP_DECODER 1
 #define CONFIG_HEVC_DECODER 1
+#define CONFIG_HEVC_QSV_DECODER 0
 #define CONFIG_HNM4_VIDEO_DECODER 1
 #define CONFIG_HQ_HQA_DECODER 1
 #define CONFIG_HQX_DECODER 1
@@ -1724,6 +1791,7 @@
 #define CONFIG_MPEG_VDPAU_DECODER 0
 #define CONFIG_MPEG1_VDPAU_DECODER 0
 #define CONFIG_MPEG2_CRYSTALHD_DECODER 0
+#define CONFIG_MPEG2_QSV_DECODER 0
 #define CONFIG_MSA1_DECODER 1
 #define CONFIG_MSMPEG4_CRYSTALHD_DECODER 0
 #define CONFIG_MSMPEG4V1_DECODER 1
@@ -1802,6 +1870,7 @@
 #define CONFIG_VC1_CRYSTALHD_DECODER 0
 #define CONFIG_VC1_VDPAU_DECODER 0
 #define CONFIG_VC1IMAGE_DECODER 1
+#define CONFIG_VC1_QSV_DECODER 0
 #define CONFIG_VCR1_DECODER 1
 #define CONFIG_VMDVIDEO_DECODER 1
 #define CONFIG_VMNC_DECODER 1
@@ -1836,6 +1905,7 @@
 #define CONFIG_ZLIB_DECODER 1
 #define CONFIG_ZMBV_DECODER 1
 #define CONFIG_AAC_DECODER 1
+#define CONFIG_AAC_FIXED_DECODER 1
 #define CONFIG_AAC_LATM_DECODER 1
 #define CONFIG_AC3_DECODER 1
 #define CONFIG_AC3_FIXED_DECODER 1
@@ -1978,6 +2048,7 @@
 #define CONFIG_ADPCM_SBPRO_4_DECODER 1
 #define CONFIG_ADPCM_SWF_DECODER 1
 #define CONFIG_ADPCM_THP_DECODER 1
+#define CONFIG_ADPCM_THP_LE_DECODER 1
 #define CONFIG_ADPCM_VIMA_DECODER 1
 #define CONFIG_ADPCM_XA_DECODER 1
 #define CONFIG_ADPCM_YAMAHA_DECODER 1
@@ -2025,6 +2096,7 @@
 #define CONFIG_BINTEXT_DECODER 1
 #define CONFIG_XBIN_DECODER 1
 #define CONFIG_IDF_DECODER 1
+#define CONFIG_AA_DEMUXER 1
 #define CONFIG_AAC_DEMUXER 1
 #define CONFIG_AC3_DEMUXER 1
 #define CONFIG_ACT_DEMUXER 1
@@ -2041,6 +2113,7 @@
 #define CONFIG_APNG_DEMUXER 1
 #define CONFIG_AQTITLE_DEMUXER 1
 #define CONFIG_ASF_DEMUXER 1
+#define CONFIG_ASF_O_DEMUXER 1
 #define CONFIG_ASS_DEMUXER 1
 #define CONFIG_AST_DEMUXER 1
 #define CONFIG_AU_DEMUXER 1
@@ -2054,6 +2127,7 @@
 #define CONFIG_BINK_DEMUXER 1
 #define CONFIG_BIT_DEMUXER 1
 #define CONFIG_BMV_DEMUXER 1
+#define CONFIG_BFSTM_DEMUXER 1
 #define CONFIG_BRSTM_DEMUXER 1
 #define CONFIG_BOA_DEMUXER 1
 #define CONFIG_C93_DEMUXER 1
@@ -2250,6 +2324,7 @@
 #define CONFIG_YOP_DEMUXER 1
 #define CONFIG_YUV4MPEGPIPE_DEMUXER 1
 #define CONFIG_IMAGE_BMP_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_DDS_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_DPX_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_EXR_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_J2K_PIPE_DEMUXER 1
@@ -2292,6 +2367,7 @@
 #define CONFIG_H261_ENCODER 1
 #define CONFIG_H263_ENCODER 1
 #define CONFIG_H263P_ENCODER 1
+#define CONFIG_HAP_ENCODER 0
 #define CONFIG_HUFFYUV_ENCODER 1
 #define CONFIG_JPEG2000_ENCODER 1
 #define CONFIG_JPEGLS_ENCODER 1
@@ -2427,6 +2503,7 @@
 #define CONFIG_LIBWAVPACK_ENCODER 0
 #define CONFIG_LIBWEBP_ANIM_ENCODER 0
 #define CONFIG_LIBWEBP_ENCODER 0
+#define CONFIG_LIBX262_ENCODER 0
 #define CONFIG_LIBX264_ENCODER 0
 #define CONFIG_LIBX264RGB_ENCODER 0
 #define CONFIG_LIBX265_ENCODER 0
@@ -2438,6 +2515,10 @@
 #define CONFIG_NVENC_ENCODER 0
 #define CONFIG_NVENC_H264_ENCODER 0
 #define CONFIG_NVENC_HEVC_ENCODER 0
+#define CONFIG_HEVC_QSV_ENCODER 0
+#define CONFIG_LIBKVAZAAR_ENCODER 0
+#define CONFIG_MPEG2_QSV_ENCODER 0
+#define CONFIG_ACROSSFADE_FILTER 0
 #define CONFIG_ADELAY_FILTER 0
 #define CONFIG_AECHO_FILTER 0
 #define CONFIG_AEVAL_FILTER 0
@@ -2452,6 +2533,7 @@
 #define CONFIG_APERMS_FILTER 0
 #define CONFIG_APHASER_FILTER 0
 #define CONFIG_ARESAMPLE_FILTER 0
+#define CONFIG_AREVERSE_FILTER 0
 #define CONFIG_ASELECT_FILTER 0
 #define CONFIG_ASENDCMD_FILTER 0
 #define CONFIG_ASETNSAMPLES_FILTER 0
@@ -2476,6 +2558,7 @@
 #define CONFIG_CHORUS_FILTER 0
 #define CONFIG_COMPAND_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
@@ -2487,6 +2570,7 @@
 #define CONFIG_PAN_FILTER 0
 #define CONFIG_REPLAYGAIN_FILTER 0
 #define CONFIG_RESAMPLE_FILTER 0
+#define CONFIG_SIDECHAINCOMPRESS_FILTER 0
 #define CONFIG_SILENCEDETECT_FILTER 0
 #define CONFIG_SILENCEREMOVE_FILTER 0
 #define CONFIG_TREBLE_FILTER 0
@@ -2499,6 +2583,7 @@
 #define CONFIG_ANULLSINK_FILTER 0
 #define CONFIG_ALPHAEXTRACT_FILTER 0
 #define CONFIG_ALPHAMERGE_FILTER 0
+#define CONFIG_ATADENOISE_FILTER 0
 #define CONFIG_ASS_FILTER 0
 #define CONFIG_BBOX_FILTER 0
 #define CONFIG_BLACKDETECT_FILTER 0
@@ -2508,6 +2593,7 @@
 #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_COPY_FILTER 0
@@ -2516,17 +2602,22 @@
 #define CONFIG_CROPDETECT_FILTER 0
 #define CONFIG_CURVES_FILTER 0
 #define CONFIG_DCTDNOIZ_FILTER 0
+#define CONFIG_DEBAND_FILTER 0
 #define CONFIG_DECIMATE_FILTER 0
+#define CONFIG_DEFLATE_FILTER 0
 #define CONFIG_DEJUDDER_FILTER 0
 #define CONFIG_DELOGO_FILTER 0
 #define CONFIG_DESHAKE_FILTER 0
 #define CONFIG_DETELECINE_FILTER 0
+#define CONFIG_DILATION_FILTER 0
 #define CONFIG_DRAWBOX_FILTER 0
+#define CONFIG_DRAWGRAPH_FILTER 0
 #define CONFIG_DRAWGRID_FILTER 0
 #define CONFIG_DRAWTEXT_FILTER 0
 #define CONFIG_EDGEDETECT_FILTER 0
 #define CONFIG_ELBG_FILTER 0
 #define CONFIG_EQ_FILTER 0
+#define CONFIG_EROSION_FILTER 0
 #define CONFIG_EXTRACTPLANES_FILTER 0
 #define CONFIG_FADE_FILTER 0
 #define CONFIG_FFTFILT_FILTER 0
@@ -2537,6 +2628,7 @@
 #define CONFIG_FORMAT_FILTER 0
 #define CONFIG_FPS_FILTER 0
 #define CONFIG_FRAMEPACK_FILTER 0
+#define CONFIG_FRAMERATE_FILTER 0
 #define CONFIG_FRAMESTEP_FILTER 0
 #define CONFIG_FREI0R_FILTER 0
 #define CONFIG_FSPP_FILTER 0
@@ -2548,9 +2640,11 @@
 #define CONFIG_HISTOGRAM_FILTER 0
 #define CONFIG_HQDN3D_FILTER 0
 #define CONFIG_HQX_FILTER 0
+#define CONFIG_HSTACK_FILTER 0
 #define CONFIG_HUE_FILTER 0
 #define CONFIG_IDET_FILTER 0
 #define CONFIG_IL_FILTER 0
+#define CONFIG_INFLATE_FILTER 0
 #define CONFIG_INTERLACE_FILTER 0
 #define CONFIG_INTERLEAVE_FILTER 0
 #define CONFIG_KERNDEINT_FILTER 0
@@ -2581,11 +2675,15 @@
 #define CONFIG_PSNR_FILTER 0
 #define CONFIG_PULLUP_FILTER 0
 #define CONFIG_QP_FILTER 0
+#define CONFIG_RANDOM_FILTER 0
+#define CONFIG_REMOVEGRAIN_FILTER 0
 #define CONFIG_REMOVELOGO_FILTER 0
 #define CONFIG_REPEATFIELDS_FILTER 0
+#define CONFIG_REVERSE_FILTER 0
 #define CONFIG_ROTATE_FILTER 0
 #define CONFIG_SAB_FILTER 0
 #define CONFIG_SCALE_FILTER 0
+#define CONFIG_SCALE2REF_FILTER 0
 #define CONFIG_SELECT_FILTER 0
 #define CONFIG_SENDCMD_FILTER 0
 #define CONFIG_SEPARATEFIELDS_FILTER 0
@@ -2601,6 +2699,7 @@
 #define CONFIG_SMARTBLUR_FILTER 0
 #define CONFIG_SPLIT_FILTER 0
 #define CONFIG_SPP_FILTER 0
+#define CONFIG_SSIM_FILTER 0
 #define CONFIG_STEREO3D_FILTER 0
 #define CONFIG_SUBTITLES_FILTER 0
 #define CONFIG_SUPER2XSAI_FILTER 0
@@ -2614,15 +2713,20 @@
 #define CONFIG_TRIM_FILTER 0
 #define CONFIG_UNSHARP_FILTER 0
 #define CONFIG_USPP_FILTER 0
+#define CONFIG_VECTORSCOPE_FILTER 0
 #define CONFIG_VFLIP_FILTER 0
 #define CONFIG_VIDSTABDETECT_FILTER 0
 #define CONFIG_VIDSTABTRANSFORM_FILTER 0
 #define CONFIG_VIGNETTE_FILTER 0
+#define CONFIG_VSTACK_FILTER 0
 #define CONFIG_W3FDIF_FILTER 0
+#define CONFIG_WAVEFORM_FILTER 0
 #define CONFIG_XBR_FILTER 0
 #define CONFIG_YADIF_FILTER 0
 #define CONFIG_ZMQ_FILTER 0
 #define CONFIG_ZOOMPAN_FILTER 0
+#define CONFIG_ALLRGB_FILTER 0
+#define CONFIG_ALLYUV_FILTER 0
 #define CONFIG_CELLAUTO_FILTER 0
 #define CONFIG_COLOR_FILTER 0
 #define CONFIG_FREI0R_SRC_FILTER 0
@@ -2636,16 +2740,21 @@
 #define CONFIG_SMPTEHDBARS_FILTER 0
 #define CONFIG_TESTSRC_FILTER 0
 #define CONFIG_NULLSINK_FILTER 0
+#define CONFIG_ADRAWGRAPH_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_SHOWVOLUME_FILTER 0
 #define CONFIG_SHOWWAVES_FILTER 0
 #define CONFIG_SHOWWAVESPIC_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
 #define CONFIG_H264_MMAL_HWACCEL 0
@@ -2654,21 +2763,30 @@
 #define CONFIG_H264_VDA_HWACCEL 0
 #define CONFIG_H264_VDA_OLD_HWACCEL 0
 #define CONFIG_H264_VDPAU_HWACCEL 0
+#define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0
 #define CONFIG_HEVC_D3D11VA_HWACCEL 0
 #define CONFIG_HEVC_DXVA2_HWACCEL 0
+#define CONFIG_HEVC_QSV_HWACCEL 0
+#define CONFIG_HEVC_VAAPI_HWACCEL 0
+#define CONFIG_HEVC_VDPAU_HWACCEL 0
 #define CONFIG_MPEG1_XVMC_HWACCEL 0
 #define CONFIG_MPEG1_VDPAU_HWACCEL 0
+#define CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL 0
 #define CONFIG_MPEG2_XVMC_HWACCEL 0
 #define CONFIG_MPEG2_D3D11VA_HWACCEL 0
 #define CONFIG_MPEG2_DXVA2_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_VAAPI_HWACCEL 0
 #define CONFIG_MPEG4_VDPAU_HWACCEL 0
+#define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
 #define CONFIG_VC1_D3D11VA_HWACCEL 0
 #define CONFIG_VC1_DXVA2_HWACCEL 0
 #define CONFIG_VC1_VAAPI_HWACCEL 0
 #define CONFIG_VC1_VDPAU_HWACCEL 0
+#define CONFIG_VC1_QSV_HWACCEL 0
 #define CONFIG_WMV3_D3D11VA_HWACCEL 0
 #define CONFIG_WMV3_DXVA2_HWACCEL 0
 #define CONFIG_WMV3_VAAPI_HWACCEL 0
@@ -2865,6 +2983,7 @@
 #define CONFIG_DVDSUB_PARSER 1
 #define CONFIG_DVD_NAV_PARSER 1
 #define CONFIG_FLAC_PARSER 1
+#define CONFIG_G729_PARSER 1
 #define CONFIG_GSM_PARSER 1
 #define CONFIG_H261_PARSER 1
 #define CONFIG_H263_PARSER 1
@@ -2886,6 +3005,7 @@
 #define CONFIG_VP3_PARSER 1
 #define CONFIG_VP8_PARSER 1
 #define CONFIG_VP9_PARSER 1
+#define CONFIG_ASYNC_PROTOCOL 1
 #define CONFIG_BLURAY_PROTOCOL 0
 #define CONFIG_CACHE_PROTOCOL 1
 #define CONFIG_CONCAT_PROTOCOL 1
diff --git a/android/include/config-armv8-a.h b/android/include/config-armv8-a.h
index 1da0bb174a..8ecaa4f162 100644
--- a/android/include/config-armv8-a.h
+++ b/android/include/config-armv8-a.h
@@ -6,7 +6,7 @@
 #define CONFIG_THIS_YEAR 2015
 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
 #define AVCONV_DATADIR "/usr/local/share/ffmpeg"
-#define CC_IDENT "gcc 4.9 (GCC) 20140514 (prerelease)"
+#define CC_IDENT "gcc 4.9.x-google (GCC) 20140827 (prerelease)"
 #define av_restrict restrict
 #define EXTERN_PREFIX ""
 #define EXTERN_ASM 
@@ -265,10 +265,18 @@
 #undef HAVE_MSA
 #endif
 #define HAVE_MSA 0
+#ifdef HAVE_LOONGSON2
+#undef HAVE_LOONGSON2
+#endif
+#define HAVE_LOONGSON2 1
 #ifdef HAVE_LOONGSON3
 #undef HAVE_LOONGSON3
 #endif
-#define HAVE_LOONGSON3 0
+#define HAVE_LOONGSON3 1
+#ifdef HAVE_MMI
+#undef HAVE_MMI
+#endif
+#define HAVE_MMI 0
 #ifdef HAVE_ARMV5TE_EXTERNAL
 #undef HAVE_ARMV5TE_EXTERNAL
 #endif
@@ -421,10 +429,18 @@
 #undef HAVE_MSA_EXTERNAL
 #endif
 #define HAVE_MSA_EXTERNAL 0
+#ifdef HAVE_LOONGSON2_EXTERNAL
+#undef HAVE_LOONGSON2_EXTERNAL
+#endif
+#define HAVE_LOONGSON2_EXTERNAL 0
 #ifdef HAVE_LOONGSON3_EXTERNAL
 #undef HAVE_LOONGSON3_EXTERNAL
 #endif
 #define HAVE_LOONGSON3_EXTERNAL 0
+#ifdef HAVE_MMI_EXTERNAL
+#undef HAVE_MMI_EXTERNAL
+#endif
+#define HAVE_MMI_EXTERNAL 0
 #ifdef HAVE_ARMV5TE_INLINE
 #undef HAVE_ARMV5TE_INLINE
 #endif
@@ -577,10 +593,18 @@
 #undef HAVE_MSA_INLINE
 #endif
 #define HAVE_MSA_INLINE 0
+#ifdef HAVE_LOONGSON2_INLINE
+#undef HAVE_LOONGSON2_INLINE
+#endif
+#define HAVE_LOONGSON2_INLINE 0
 #ifdef HAVE_LOONGSON3_INLINE
 #undef HAVE_LOONGSON3_INLINE
 #endif
 #define HAVE_LOONGSON3_INLINE 0
+#ifdef HAVE_MMI_INLINE
+#undef HAVE_MMI_INLINE
+#endif
+#define HAVE_MMI_INLINE 0
 #ifdef HAVE_ALIGNED_STACK
 #undef HAVE_ALIGNED_STACK
 #endif
@@ -729,6 +753,10 @@
 #undef HAVE_DIRECT_H
 #endif
 #define HAVE_DIRECT_H 0
+#ifdef HAVE_DIRENT_H
+#undef HAVE_DIRENT_H
+#endif
+#define HAVE_DIRENT_H 1
 #ifdef HAVE_DLFCN_H
 #undef HAVE_DLFCN_H
 #endif
@@ -865,10 +893,18 @@
 #undef HAVE_CBRTF
 #endif
 #define HAVE_CBRTF 1
+#ifdef HAVE_COPYSIGN
+#undef HAVE_COPYSIGN
+#endif
+#define HAVE_COPYSIGN 1
 #ifdef HAVE_COSF
 #undef HAVE_COSF
 #endif
 #define HAVE_COSF 1
+#ifdef HAVE_ERF
+#undef HAVE_ERF
+#endif
+#define HAVE_ERF 1
 #ifdef HAVE_EXP2
 #undef HAVE_EXP2
 #endif
@@ -1065,6 +1101,10 @@
 #undef HAVE_LOCALTIME_R
 #endif
 #define HAVE_LOCALTIME_R 1
+#ifdef HAVE_LSTAT
+#undef HAVE_LSTAT
+#endif
+#define HAVE_LSTAT 1
 #ifdef HAVE_LZO1X_999_COMPRESS
 #undef HAVE_LZO1X_999_COMPRESS
 #endif
@@ -1117,6 +1157,10 @@
 #undef HAVE_SETCONSOLETEXTATTRIBUTE
 #endif
 #define HAVE_SETCONSOLETEXTATTRIBUTE 0
+#ifdef HAVE_SETCONSOLECTRLHANDLER
+#undef HAVE_SETCONSOLECTRLHANDLER
+#endif
+#define HAVE_SETCONSOLECTRLHANDLER 0
 #ifdef HAVE_SETMODE
 #undef HAVE_SETMODE
 #endif
@@ -1261,6 +1305,10 @@
 #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
@@ -1394,7 +1442,7 @@
 #define CONFIG_PODPAGES 1
 #define CONFIG_TXTPAGES 0
 #define CONFIG_AVIO_READING_EXAMPLE 1
-#define CONFIG_AVIO_LIST_DIR_EXAMPLE 1
+#define CONFIG_AVIO_DIR_CMD_EXAMPLE 1
 #define CONFIG_DECODING_ENCODING_EXAMPLE 1
 #define CONFIG_DEMUXING_DECODING_EXAMPLE 1
 #define CONFIG_EXTRACT_MVS_EXAMPLE 1
@@ -1436,6 +1484,7 @@
 #define CONFIG_LIBGSM 0
 #define CONFIG_LIBIEC61883 0
 #define CONFIG_LIBILBC 0
+#define CONFIG_LIBKVAZAAR 0
 #define CONFIG_LIBMFX 0
 #define CONFIG_LIBMODPLUG 0
 #define CONFIG_LIBMP3LAME 0
@@ -1452,6 +1501,7 @@
 #define CONFIG_LIBSCHROEDINGER 0
 #define CONFIG_LIBSHINE 0
 #define CONFIG_LIBSMBCLIENT 0
+#define CONFIG_LIBSNAPPY 0
 #define CONFIG_LIBSOXR 0
 #define CONFIG_LIBSPEEX 0
 #define CONFIG_LIBSSH 0
@@ -1503,6 +1553,7 @@
 #define CONFIG_VAAPI 0
 #define CONFIG_VDA 0
 #define CONFIG_VDPAU 0
+#define CONFIG_VIDEOTOOLBOX 0
 #define CONFIG_XVMC 0
 #define CONFIG_GPL 0
 #define CONFIG_NONFREE 0
@@ -1555,8 +1606,10 @@
 #define CONFIG_FAANDCT 1
 #define CONFIG_FAANIDCT 1
 #define CONFIG_FDCTDSP 1
+#define CONFIG_FLACDSP 1
 #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
@@ -1574,7 +1627,9 @@
 #define CONFIG_IIRFILTER 1
 #define CONFIG_IMDCT15 1
 #define CONFIG_INTRAX8 1
+#define CONFIG_IVIDSP 1
 #define CONFIG_JPEGTABLES 1
+#define CONFIG_LIBX262 0
 #define CONFIG_LGPLV3 0
 #define CONFIG_LLAUDDSP 1
 #define CONFIG_LLVIDDSP 1
@@ -1585,6 +1640,7 @@
 #define CONFIG_MPEGAUDIODSP 1
 #define CONFIG_MPEGVIDEO 1
 #define CONFIG_MPEGVIDEOENC 1
+#define CONFIG_MSS34DSP 1
 #define CONFIG_PIXBLOCKDSP 1
 #define CONFIG_QPELDSP 1
 #define CONFIG_QSV 0
@@ -1595,16 +1651,24 @@
 #define CONFIG_RIFFENC 1
 #define CONFIG_RTPDEC 1
 #define CONFIG_RTPENC_CHAIN 1
+#define CONFIG_RV34DSP 1
 #define CONFIG_SINEWIN 1
+#define CONFIG_SNAPPY 1
 #define CONFIG_STARTCODE 1
+#define CONFIG_TEXTUREDSP 1
+#define CONFIG_TEXTUREDSPENC 0
 #define CONFIG_TPELDSP 1
 #define CONFIG_VIDEODSP 1
 #define CONFIG_VP3DSP 1
+#define CONFIG_VP56DSP 1
+#define CONFIG_VP8DSP 1
 #define CONFIG_WMA_FREQS 1
+#define CONFIG_WMV2DSP 1
 #define CONFIG_AAC_ADTSTOASC_BSF 1
 #define CONFIG_CHOMP_BSF 1
 #define CONFIG_DUMP_EXTRADATA_BSF 1
 #define CONFIG_H264_MP4TOANNEXB_BSF 1
+#define CONFIG_HEVC_MP4TOANNEXB_BSF 1
 #define CONFIG_IMX_DUMP_HEADER_BSF 1
 #define CONFIG_MJPEG2JPEG_BSF 1
 #define CONFIG_MJPEGA_DUMP_HEADER_BSF 1
@@ -1647,6 +1711,7 @@
 #define CONFIG_CPIA_DECODER 1
 #define CONFIG_CSCD_DECODER 1
 #define CONFIG_CYUV_DECODER 1
+#define CONFIG_DDS_DECODER 1
 #define CONFIG_DFA_DECODER 1
 #define CONFIG_DIRAC_DECODER 1
 #define CONFIG_DNXHD_DECODER 1
@@ -1688,7 +1753,9 @@
 #define CONFIG_H264_QSV_DECODER 0
 #define CONFIG_H264_VDA_DECODER 0
 #define CONFIG_H264_VDPAU_DECODER 0
+#define CONFIG_HAP_DECODER 1
 #define CONFIG_HEVC_DECODER 1
+#define CONFIG_HEVC_QSV_DECODER 0
 #define CONFIG_HNM4_VIDEO_DECODER 1
 #define CONFIG_HQ_HQA_DECODER 1
 #define CONFIG_HQX_DECODER 1
@@ -1724,6 +1791,7 @@
 #define CONFIG_MPEG_VDPAU_DECODER 0
 #define CONFIG_MPEG1_VDPAU_DECODER 0
 #define CONFIG_MPEG2_CRYSTALHD_DECODER 0
+#define CONFIG_MPEG2_QSV_DECODER 0
 #define CONFIG_MSA1_DECODER 1
 #define CONFIG_MSMPEG4_CRYSTALHD_DECODER 0
 #define CONFIG_MSMPEG4V1_DECODER 1
@@ -1802,6 +1870,7 @@
 #define CONFIG_VC1_CRYSTALHD_DECODER 0
 #define CONFIG_VC1_VDPAU_DECODER 0
 #define CONFIG_VC1IMAGE_DECODER 1
+#define CONFIG_VC1_QSV_DECODER 0
 #define CONFIG_VCR1_DECODER 1
 #define CONFIG_VMDVIDEO_DECODER 1
 #define CONFIG_VMNC_DECODER 1
@@ -1836,6 +1905,7 @@
 #define CONFIG_ZLIB_DECODER 1
 #define CONFIG_ZMBV_DECODER 1
 #define CONFIG_AAC_DECODER 1
+#define CONFIG_AAC_FIXED_DECODER 1
 #define CONFIG_AAC_LATM_DECODER 1
 #define CONFIG_AC3_DECODER 1
 #define CONFIG_AC3_FIXED_DECODER 1
@@ -1978,6 +2048,7 @@
 #define CONFIG_ADPCM_SBPRO_4_DECODER 1
 #define CONFIG_ADPCM_SWF_DECODER 1
 #define CONFIG_ADPCM_THP_DECODER 1
+#define CONFIG_ADPCM_THP_LE_DECODER 1
 #define CONFIG_ADPCM_VIMA_DECODER 1
 #define CONFIG_ADPCM_XA_DECODER 1
 #define CONFIG_ADPCM_YAMAHA_DECODER 1
@@ -2025,6 +2096,7 @@
 #define CONFIG_BINTEXT_DECODER 1
 #define CONFIG_XBIN_DECODER 1
 #define CONFIG_IDF_DECODER 1
+#define CONFIG_AA_DEMUXER 1
 #define CONFIG_AAC_DEMUXER 1
 #define CONFIG_AC3_DEMUXER 1
 #define CONFIG_ACT_DEMUXER 1
@@ -2041,6 +2113,7 @@
 #define CONFIG_APNG_DEMUXER 1
 #define CONFIG_AQTITLE_DEMUXER 1
 #define CONFIG_ASF_DEMUXER 1
+#define CONFIG_ASF_O_DEMUXER 1
 #define CONFIG_ASS_DEMUXER 1
 #define CONFIG_AST_DEMUXER 1
 #define CONFIG_AU_DEMUXER 1
@@ -2054,6 +2127,7 @@
 #define CONFIG_BINK_DEMUXER 1
 #define CONFIG_BIT_DEMUXER 1
 #define CONFIG_BMV_DEMUXER 1
+#define CONFIG_BFSTM_DEMUXER 1
 #define CONFIG_BRSTM_DEMUXER 1
 #define CONFIG_BOA_DEMUXER 1
 #define CONFIG_C93_DEMUXER 1
@@ -2250,6 +2324,7 @@
 #define CONFIG_YOP_DEMUXER 1
 #define CONFIG_YUV4MPEGPIPE_DEMUXER 1
 #define CONFIG_IMAGE_BMP_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_DDS_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_DPX_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_EXR_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_J2K_PIPE_DEMUXER 1
@@ -2292,6 +2367,7 @@
 #define CONFIG_H261_ENCODER 1
 #define CONFIG_H263_ENCODER 1
 #define CONFIG_H263P_ENCODER 1
+#define CONFIG_HAP_ENCODER 0
 #define CONFIG_HUFFYUV_ENCODER 1
 #define CONFIG_JPEG2000_ENCODER 1
 #define CONFIG_JPEGLS_ENCODER 1
@@ -2427,6 +2503,7 @@
 #define CONFIG_LIBWAVPACK_ENCODER 0
 #define CONFIG_LIBWEBP_ANIM_ENCODER 0
 #define CONFIG_LIBWEBP_ENCODER 0
+#define CONFIG_LIBX262_ENCODER 0
 #define CONFIG_LIBX264_ENCODER 0
 #define CONFIG_LIBX264RGB_ENCODER 0
 #define CONFIG_LIBX265_ENCODER 0
@@ -2438,6 +2515,10 @@
 #define CONFIG_NVENC_ENCODER 0
 #define CONFIG_NVENC_H264_ENCODER 0
 #define CONFIG_NVENC_HEVC_ENCODER 0
+#define CONFIG_HEVC_QSV_ENCODER 0
+#define CONFIG_LIBKVAZAAR_ENCODER 0
+#define CONFIG_MPEG2_QSV_ENCODER 0
+#define CONFIG_ACROSSFADE_FILTER 0
 #define CONFIG_ADELAY_FILTER 0
 #define CONFIG_AECHO_FILTER 0
 #define CONFIG_AEVAL_FILTER 0
@@ -2452,6 +2533,7 @@
 #define CONFIG_APERMS_FILTER 0
 #define CONFIG_APHASER_FILTER 0
 #define CONFIG_ARESAMPLE_FILTER 0
+#define CONFIG_AREVERSE_FILTER 0
 #define CONFIG_ASELECT_FILTER 0
 #define CONFIG_ASENDCMD_FILTER 0
 #define CONFIG_ASETNSAMPLES_FILTER 0
@@ -2476,6 +2558,7 @@
 #define CONFIG_CHORUS_FILTER 0
 #define CONFIG_COMPAND_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
@@ -2487,6 +2570,7 @@
 #define CONFIG_PAN_FILTER 0
 #define CONFIG_REPLAYGAIN_FILTER 0
 #define CONFIG_RESAMPLE_FILTER 0
+#define CONFIG_SIDECHAINCOMPRESS_FILTER 0
 #define CONFIG_SILENCEDETECT_FILTER 0
 #define CONFIG_SILENCEREMOVE_FILTER 0
 #define CONFIG_TREBLE_FILTER 0
@@ -2499,6 +2583,7 @@
 #define CONFIG_ANULLSINK_FILTER 0
 #define CONFIG_ALPHAEXTRACT_FILTER 0
 #define CONFIG_ALPHAMERGE_FILTER 0
+#define CONFIG_ATADENOISE_FILTER 0
 #define CONFIG_ASS_FILTER 0
 #define CONFIG_BBOX_FILTER 0
 #define CONFIG_BLACKDETECT_FILTER 0
@@ -2508,6 +2593,7 @@
 #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_COPY_FILTER 0
@@ -2516,17 +2602,22 @@
 #define CONFIG_CROPDETECT_FILTER 0
 #define CONFIG_CURVES_FILTER 0
 #define CONFIG_DCTDNOIZ_FILTER 0
+#define CONFIG_DEBAND_FILTER 0
 #define CONFIG_DECIMATE_FILTER 0
+#define CONFIG_DEFLATE_FILTER 0
 #define CONFIG_DEJUDDER_FILTER 0
 #define CONFIG_DELOGO_FILTER 0
 #define CONFIG_DESHAKE_FILTER 0
 #define CONFIG_DETELECINE_FILTER 0
+#define CONFIG_DILATION_FILTER 0
 #define CONFIG_DRAWBOX_FILTER 0
+#define CONFIG_DRAWGRAPH_FILTER 0
 #define CONFIG_DRAWGRID_FILTER 0
 #define CONFIG_DRAWTEXT_FILTER 0
 #define CONFIG_EDGEDETECT_FILTER 0
 #define CONFIG_ELBG_FILTER 0
 #define CONFIG_EQ_FILTER 0
+#define CONFIG_EROSION_FILTER 0
 #define CONFIG_EXTRACTPLANES_FILTER 0
 #define CONFIG_FADE_FILTER 0
 #define CONFIG_FFTFILT_FILTER 0
@@ -2537,6 +2628,7 @@
 #define CONFIG_FORMAT_FILTER 0
 #define CONFIG_FPS_FILTER 0
 #define CONFIG_FRAMEPACK_FILTER 0
+#define CONFIG_FRAMERATE_FILTER 0
 #define CONFIG_FRAMESTEP_FILTER 0
 #define CONFIG_FREI0R_FILTER 0
 #define CONFIG_FSPP_FILTER 0
@@ -2548,9 +2640,11 @@
 #define CONFIG_HISTOGRAM_FILTER 0
 #define CONFIG_HQDN3D_FILTER 0
 #define CONFIG_HQX_FILTER 0
+#define CONFIG_HSTACK_FILTER 0
 #define CONFIG_HUE_FILTER 0
 #define CONFIG_IDET_FILTER 0
 #define CONFIG_IL_FILTER 0
+#define CONFIG_INFLATE_FILTER 0
 #define CONFIG_INTERLACE_FILTER 0
 #define CONFIG_INTERLEAVE_FILTER 0
 #define CONFIG_KERNDEINT_FILTER 0
@@ -2581,11 +2675,15 @@
 #define CONFIG_PSNR_FILTER 0
 #define CONFIG_PULLUP_FILTER 0
 #define CONFIG_QP_FILTER 0
+#define CONFIG_RANDOM_FILTER 0
+#define CONFIG_REMOVEGRAIN_FILTER 0
 #define CONFIG_REMOVELOGO_FILTER 0
 #define CONFIG_REPEATFIELDS_FILTER 0
+#define CONFIG_REVERSE_FILTER 0
 #define CONFIG_ROTATE_FILTER 0
 #define CONFIG_SAB_FILTER 0
 #define CONFIG_SCALE_FILTER 0
+#define CONFIG_SCALE2REF_FILTER 0
 #define CONFIG_SELECT_FILTER 0
 #define CONFIG_SENDCMD_FILTER 0
 #define CONFIG_SEPARATEFIELDS_FILTER 0
@@ -2601,6 +2699,7 @@
 #define CONFIG_SMARTBLUR_FILTER 0
 #define CONFIG_SPLIT_FILTER 0
 #define CONFIG_SPP_FILTER 0
+#define CONFIG_SSIM_FILTER 0
 #define CONFIG_STEREO3D_FILTER 0
 #define CONFIG_SUBTITLES_FILTER 0
 #define CONFIG_SUPER2XSAI_FILTER 0
@@ -2614,15 +2713,20 @@
 #define CONFIG_TRIM_FILTER 0
 #define CONFIG_UNSHARP_FILTER 0
 #define CONFIG_USPP_FILTER 0
+#define CONFIG_VECTORSCOPE_FILTER 0
 #define CONFIG_VFLIP_FILTER 0
 #define CONFIG_VIDSTABDETECT_FILTER 0
 #define CONFIG_VIDSTABTRANSFORM_FILTER 0
 #define CONFIG_VIGNETTE_FILTER 0
+#define CONFIG_VSTACK_FILTER 0
 #define CONFIG_W3FDIF_FILTER 0
+#define CONFIG_WAVEFORM_FILTER 0
 #define CONFIG_XBR_FILTER 0
 #define CONFIG_YADIF_FILTER 0
 #define CONFIG_ZMQ_FILTER 0
 #define CONFIG_ZOOMPAN_FILTER 0
+#define CONFIG_ALLRGB_FILTER 0
+#define CONFIG_ALLYUV_FILTER 0
 #define CONFIG_CELLAUTO_FILTER 0
 #define CONFIG_COLOR_FILTER 0
 #define CONFIG_FREI0R_SRC_FILTER 0
@@ -2636,16 +2740,21 @@
 #define CONFIG_SMPTEHDBARS_FILTER 0
 #define CONFIG_TESTSRC_FILTER 0
 #define CONFIG_NULLSINK_FILTER 0
+#define CONFIG_ADRAWGRAPH_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_SHOWVOLUME_FILTER 0
 #define CONFIG_SHOWWAVES_FILTER 0
 #define CONFIG_SHOWWAVESPIC_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
 #define CONFIG_H264_MMAL_HWACCEL 0
@@ -2654,21 +2763,30 @@
 #define CONFIG_H264_VDA_HWACCEL 0
 #define CONFIG_H264_VDA_OLD_HWACCEL 0
 #define CONFIG_H264_VDPAU_HWACCEL 0
+#define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0
 #define CONFIG_HEVC_D3D11VA_HWACCEL 0
 #define CONFIG_HEVC_DXVA2_HWACCEL 0
+#define CONFIG_HEVC_QSV_HWACCEL 0
+#define CONFIG_HEVC_VAAPI_HWACCEL 0
+#define CONFIG_HEVC_VDPAU_HWACCEL 0
 #define CONFIG_MPEG1_XVMC_HWACCEL 0
 #define CONFIG_MPEG1_VDPAU_HWACCEL 0
+#define CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL 0
 #define CONFIG_MPEG2_XVMC_HWACCEL 0
 #define CONFIG_MPEG2_D3D11VA_HWACCEL 0
 #define CONFIG_MPEG2_DXVA2_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_VAAPI_HWACCEL 0
 #define CONFIG_MPEG4_VDPAU_HWACCEL 0
+#define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
 #define CONFIG_VC1_D3D11VA_HWACCEL 0
 #define CONFIG_VC1_DXVA2_HWACCEL 0
 #define CONFIG_VC1_VAAPI_HWACCEL 0
 #define CONFIG_VC1_VDPAU_HWACCEL 0
+#define CONFIG_VC1_QSV_HWACCEL 0
 #define CONFIG_WMV3_D3D11VA_HWACCEL 0
 #define CONFIG_WMV3_DXVA2_HWACCEL 0
 #define CONFIG_WMV3_VAAPI_HWACCEL 0
@@ -2865,6 +2983,7 @@
 #define CONFIG_DVDSUB_PARSER 1
 #define CONFIG_DVD_NAV_PARSER 1
 #define CONFIG_FLAC_PARSER 1
+#define CONFIG_G729_PARSER 1
 #define CONFIG_GSM_PARSER 1
 #define CONFIG_H261_PARSER 1
 #define CONFIG_H263_PARSER 1
@@ -2886,6 +3005,7 @@
 #define CONFIG_VP3_PARSER 1
 #define CONFIG_VP8_PARSER 1
 #define CONFIG_VP9_PARSER 1
+#define CONFIG_ASYNC_PROTOCOL 1
 #define CONFIG_BLURAY_PROTOCOL 0
 #define CONFIG_CACHE_PROTOCOL 1
 #define CONFIG_CONCAT_PROTOCOL 1
diff --git a/android/include/config-silvermont.h b/android/include/config-silvermont.h
index 66f6525ee9..f14be7273c 100644
--- a/android/include/config-silvermont.h
+++ b/android/include/config-silvermont.h
@@ -6,7 +6,7 @@
 #define CONFIG_THIS_YEAR 2015
 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
 #define AVCONV_DATADIR "/usr/local/share/ffmpeg"
-#define CC_IDENT "gcc 4.9 (GCC) 20140514 (prerelease)"
+#define CC_IDENT "gcc 4.9 (GCC) 20140827 (prerelease)"
 #define av_restrict restrict
 #define EXTERN_PREFIX ""
 #define EXTERN_ASM 
@@ -265,10 +265,18 @@
 #undef HAVE_MSA
 #endif
 #define HAVE_MSA 0
+#ifdef HAVE_LOONGSON2
+#undef HAVE_LOONGSON2
+#endif
+#define HAVE_LOONGSON2 1
 #ifdef HAVE_LOONGSON3
 #undef HAVE_LOONGSON3
 #endif
-#define HAVE_LOONGSON3 0
+#define HAVE_LOONGSON3 1
+#ifdef HAVE_MMI
+#undef HAVE_MMI
+#endif
+#define HAVE_MMI 0
 #ifdef HAVE_ARMV5TE_EXTERNAL
 #undef HAVE_ARMV5TE_EXTERNAL
 #endif
@@ -421,10 +429,18 @@
 #undef HAVE_MSA_EXTERNAL
 #endif
 #define HAVE_MSA_EXTERNAL 0
+#ifdef HAVE_LOONGSON2_EXTERNAL
+#undef HAVE_LOONGSON2_EXTERNAL
+#endif
+#define HAVE_LOONGSON2_EXTERNAL 0
 #ifdef HAVE_LOONGSON3_EXTERNAL
 #undef HAVE_LOONGSON3_EXTERNAL
 #endif
 #define HAVE_LOONGSON3_EXTERNAL 0
+#ifdef HAVE_MMI_EXTERNAL
+#undef HAVE_MMI_EXTERNAL
+#endif
+#define HAVE_MMI_EXTERNAL 0
 #ifdef HAVE_ARMV5TE_INLINE
 #undef HAVE_ARMV5TE_INLINE
 #endif
@@ -577,10 +593,18 @@
 #undef HAVE_MSA_INLINE
 #endif
 #define HAVE_MSA_INLINE 0
+#ifdef HAVE_LOONGSON2_INLINE
+#undef HAVE_LOONGSON2_INLINE
+#endif
+#define HAVE_LOONGSON2_INLINE 0
 #ifdef HAVE_LOONGSON3_INLINE
 #undef HAVE_LOONGSON3_INLINE
 #endif
 #define HAVE_LOONGSON3_INLINE 0
+#ifdef HAVE_MMI_INLINE
+#undef HAVE_MMI_INLINE
+#endif
+#define HAVE_MMI_INLINE 0
 #ifdef HAVE_ALIGNED_STACK
 #undef HAVE_ALIGNED_STACK
 #endif
@@ -729,6 +753,10 @@
 #undef HAVE_DIRECT_H
 #endif
 #define HAVE_DIRECT_H 0
+#ifdef HAVE_DIRENT_H
+#undef HAVE_DIRENT_H
+#endif
+#define HAVE_DIRENT_H 1
 #ifdef HAVE_DLFCN_H
 #undef HAVE_DLFCN_H
 #endif
@@ -865,10 +893,18 @@
 #undef HAVE_CBRTF
 #endif
 #define HAVE_CBRTF 1
+#ifdef HAVE_COPYSIGN
+#undef HAVE_COPYSIGN
+#endif
+#define HAVE_COPYSIGN 1
 #ifdef HAVE_COSF
 #undef HAVE_COSF
 #endif
 #define HAVE_COSF 1
+#ifdef HAVE_ERF
+#undef HAVE_ERF
+#endif
+#define HAVE_ERF 1
 #ifdef HAVE_EXP2
 #undef HAVE_EXP2
 #endif
@@ -1065,6 +1101,10 @@
 #undef HAVE_LOCALTIME_R
 #endif
 #define HAVE_LOCALTIME_R 1
+#ifdef HAVE_LSTAT
+#undef HAVE_LSTAT
+#endif
+#define HAVE_LSTAT 1
 #ifdef HAVE_LZO1X_999_COMPRESS
 #undef HAVE_LZO1X_999_COMPRESS
 #endif
@@ -1117,6 +1157,10 @@
 #undef HAVE_SETCONSOLETEXTATTRIBUTE
 #endif
 #define HAVE_SETCONSOLETEXTATTRIBUTE 0
+#ifdef HAVE_SETCONSOLECTRLHANDLER
+#undef HAVE_SETCONSOLECTRLHANDLER
+#endif
+#define HAVE_SETCONSOLECTRLHANDLER 0
 #ifdef HAVE_SETMODE
 #undef HAVE_SETMODE
 #endif
@@ -1261,6 +1305,10 @@
 #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
@@ -1394,7 +1442,7 @@
 #define CONFIG_PODPAGES 1
 #define CONFIG_TXTPAGES 0
 #define CONFIG_AVIO_READING_EXAMPLE 1
-#define CONFIG_AVIO_LIST_DIR_EXAMPLE 1
+#define CONFIG_AVIO_DIR_CMD_EXAMPLE 1
 #define CONFIG_DECODING_ENCODING_EXAMPLE 1
 #define CONFIG_DEMUXING_DECODING_EXAMPLE 1
 #define CONFIG_EXTRACT_MVS_EXAMPLE 1
@@ -1436,6 +1484,7 @@
 #define CONFIG_LIBGSM 0
 #define CONFIG_LIBIEC61883 0
 #define CONFIG_LIBILBC 0
+#define CONFIG_LIBKVAZAAR 0
 #define CONFIG_LIBMFX 0
 #define CONFIG_LIBMODPLUG 0
 #define CONFIG_LIBMP3LAME 0
@@ -1452,6 +1501,7 @@
 #define CONFIG_LIBSCHROEDINGER 0
 #define CONFIG_LIBSHINE 0
 #define CONFIG_LIBSMBCLIENT 0
+#define CONFIG_LIBSNAPPY 0
 #define CONFIG_LIBSOXR 0
 #define CONFIG_LIBSPEEX 0
 #define CONFIG_LIBSSH 0
@@ -1503,6 +1553,7 @@
 #define CONFIG_VAAPI 0
 #define CONFIG_VDA 0
 #define CONFIG_VDPAU 0
+#define CONFIG_VIDEOTOOLBOX 0
 #define CONFIG_XVMC 0
 #define CONFIG_GPL 0
 #define CONFIG_NONFREE 0
@@ -1555,8 +1606,10 @@
 #define CONFIG_FAANDCT 1
 #define CONFIG_FAANIDCT 1
 #define CONFIG_FDCTDSP 1
+#define CONFIG_FLACDSP 1
 #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
@@ -1574,7 +1627,9 @@
 #define CONFIG_IIRFILTER 1
 #define CONFIG_IMDCT15 1
 #define CONFIG_INTRAX8 1
+#define CONFIG_IVIDSP 1
 #define CONFIG_JPEGTABLES 1
+#define CONFIG_LIBX262 0
 #define CONFIG_LGPLV3 0
 #define CONFIG_LLAUDDSP 1
 #define CONFIG_LLVIDDSP 1
@@ -1585,6 +1640,7 @@
 #define CONFIG_MPEGAUDIODSP 1
 #define CONFIG_MPEGVIDEO 1
 #define CONFIG_MPEGVIDEOENC 1
+#define CONFIG_MSS34DSP 1
 #define CONFIG_PIXBLOCKDSP 1
 #define CONFIG_QPELDSP 1
 #define CONFIG_QSV 0
@@ -1595,16 +1651,24 @@
 #define CONFIG_RIFFENC 1
 #define CONFIG_RTPDEC 1
 #define CONFIG_RTPENC_CHAIN 1
+#define CONFIG_RV34DSP 1
 #define CONFIG_SINEWIN 1
+#define CONFIG_SNAPPY 1
 #define CONFIG_STARTCODE 1
+#define CONFIG_TEXTUREDSP 1
+#define CONFIG_TEXTUREDSPENC 0
 #define CONFIG_TPELDSP 1
 #define CONFIG_VIDEODSP 1
 #define CONFIG_VP3DSP 1
+#define CONFIG_VP56DSP 1
+#define CONFIG_VP8DSP 1
 #define CONFIG_WMA_FREQS 1
+#define CONFIG_WMV2DSP 1
 #define CONFIG_AAC_ADTSTOASC_BSF 1
 #define CONFIG_CHOMP_BSF 1
 #define CONFIG_DUMP_EXTRADATA_BSF 1
 #define CONFIG_H264_MP4TOANNEXB_BSF 1
+#define CONFIG_HEVC_MP4TOANNEXB_BSF 1
 #define CONFIG_IMX_DUMP_HEADER_BSF 1
 #define CONFIG_MJPEG2JPEG_BSF 1
 #define CONFIG_MJPEGA_DUMP_HEADER_BSF 1
@@ -1647,6 +1711,7 @@
 #define CONFIG_CPIA_DECODER 1
 #define CONFIG_CSCD_DECODER 1
 #define CONFIG_CYUV_DECODER 1
+#define CONFIG_DDS_DECODER 1
 #define CONFIG_DFA_DECODER 1
 #define CONFIG_DIRAC_DECODER 1
 #define CONFIG_DNXHD_DECODER 1
@@ -1688,7 +1753,9 @@
 #define CONFIG_H264_QSV_DECODER 0
 #define CONFIG_H264_VDA_DECODER 0
 #define CONFIG_H264_VDPAU_DECODER 0
+#define CONFIG_HAP_DECODER 1
 #define CONFIG_HEVC_DECODER 1
+#define CONFIG_HEVC_QSV_DECODER 0
 #define CONFIG_HNM4_VIDEO_DECODER 1
 #define CONFIG_HQ_HQA_DECODER 1
 #define CONFIG_HQX_DECODER 1
@@ -1724,6 +1791,7 @@
 #define CONFIG_MPEG_VDPAU_DECODER 0
 #define CONFIG_MPEG1_VDPAU_DECODER 0
 #define CONFIG_MPEG2_CRYSTALHD_DECODER 0
+#define CONFIG_MPEG2_QSV_DECODER 0
 #define CONFIG_MSA1_DECODER 1
 #define CONFIG_MSMPEG4_CRYSTALHD_DECODER 0
 #define CONFIG_MSMPEG4V1_DECODER 1
@@ -1802,6 +1870,7 @@
 #define CONFIG_VC1_CRYSTALHD_DECODER 0
 #define CONFIG_VC1_VDPAU_DECODER 0
 #define CONFIG_VC1IMAGE_DECODER 1
+#define CONFIG_VC1_QSV_DECODER 0
 #define CONFIG_VCR1_DECODER 1
 #define CONFIG_VMDVIDEO_DECODER 1
 #define CONFIG_VMNC_DECODER 1
@@ -1836,6 +1905,7 @@
 #define CONFIG_ZLIB_DECODER 1
 #define CONFIG_ZMBV_DECODER 1
 #define CONFIG_AAC_DECODER 1
+#define CONFIG_AAC_FIXED_DECODER 1
 #define CONFIG_AAC_LATM_DECODER 1
 #define CONFIG_AC3_DECODER 1
 #define CONFIG_AC3_FIXED_DECODER 1
@@ -1978,6 +2048,7 @@
 #define CONFIG_ADPCM_SBPRO_4_DECODER 1
 #define CONFIG_ADPCM_SWF_DECODER 1
 #define CONFIG_ADPCM_THP_DECODER 1
+#define CONFIG_ADPCM_THP_LE_DECODER 1
 #define CONFIG_ADPCM_VIMA_DECODER 1
 #define CONFIG_ADPCM_XA_DECODER 1
 #define CONFIG_ADPCM_YAMAHA_DECODER 1
@@ -2025,6 +2096,7 @@
 #define CONFIG_BINTEXT_DECODER 1
 #define CONFIG_XBIN_DECODER 1
 #define CONFIG_IDF_DECODER 1
+#define CONFIG_AA_DEMUXER 1
 #define CONFIG_AAC_DEMUXER 1
 #define CONFIG_AC3_DEMUXER 1
 #define CONFIG_ACT_DEMUXER 1
@@ -2041,6 +2113,7 @@
 #define CONFIG_APNG_DEMUXER 1
 #define CONFIG_AQTITLE_DEMUXER 1
 #define CONFIG_ASF_DEMUXER 1
+#define CONFIG_ASF_O_DEMUXER 1
 #define CONFIG_ASS_DEMUXER 1
 #define CONFIG_AST_DEMUXER 1
 #define CONFIG_AU_DEMUXER 1
@@ -2054,6 +2127,7 @@
 #define CONFIG_BINK_DEMUXER 1
 #define CONFIG_BIT_DEMUXER 1
 #define CONFIG_BMV_DEMUXER 1
+#define CONFIG_BFSTM_DEMUXER 1
 #define CONFIG_BRSTM_DEMUXER 1
 #define CONFIG_BOA_DEMUXER 1
 #define CONFIG_C93_DEMUXER 1
@@ -2250,6 +2324,7 @@
 #define CONFIG_YOP_DEMUXER 1
 #define CONFIG_YUV4MPEGPIPE_DEMUXER 1
 #define CONFIG_IMAGE_BMP_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_DDS_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_DPX_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_EXR_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_J2K_PIPE_DEMUXER 1
@@ -2292,6 +2367,7 @@
 #define CONFIG_H261_ENCODER 1
 #define CONFIG_H263_ENCODER 1
 #define CONFIG_H263P_ENCODER 1
+#define CONFIG_HAP_ENCODER 0
 #define CONFIG_HUFFYUV_ENCODER 1
 #define CONFIG_JPEG2000_ENCODER 1
 #define CONFIG_JPEGLS_ENCODER 1
@@ -2427,6 +2503,7 @@
 #define CONFIG_LIBWAVPACK_ENCODER 0
 #define CONFIG_LIBWEBP_ANIM_ENCODER 0
 #define CONFIG_LIBWEBP_ENCODER 0
+#define CONFIG_LIBX262_ENCODER 0
 #define CONFIG_LIBX264_ENCODER 0
 #define CONFIG_LIBX264RGB_ENCODER 0
 #define CONFIG_LIBX265_ENCODER 0
@@ -2438,6 +2515,10 @@
 #define CONFIG_NVENC_ENCODER 0
 #define CONFIG_NVENC_H264_ENCODER 0
 #define CONFIG_NVENC_HEVC_ENCODER 0
+#define CONFIG_HEVC_QSV_ENCODER 0
+#define CONFIG_LIBKVAZAAR_ENCODER 0
+#define CONFIG_MPEG2_QSV_ENCODER 0
+#define CONFIG_ACROSSFADE_FILTER 0
 #define CONFIG_ADELAY_FILTER 0
 #define CONFIG_AECHO_FILTER 0
 #define CONFIG_AEVAL_FILTER 0
@@ -2452,6 +2533,7 @@
 #define CONFIG_APERMS_FILTER 0
 #define CONFIG_APHASER_FILTER 0
 #define CONFIG_ARESAMPLE_FILTER 0
+#define CONFIG_AREVERSE_FILTER 0
 #define CONFIG_ASELECT_FILTER 0
 #define CONFIG_ASENDCMD_FILTER 0
 #define CONFIG_ASETNSAMPLES_FILTER 0
@@ -2476,6 +2558,7 @@
 #define CONFIG_CHORUS_FILTER 0
 #define CONFIG_COMPAND_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
@@ -2487,6 +2570,7 @@
 #define CONFIG_PAN_FILTER 0
 #define CONFIG_REPLAYGAIN_FILTER 0
 #define CONFIG_RESAMPLE_FILTER 0
+#define CONFIG_SIDECHAINCOMPRESS_FILTER 0
 #define CONFIG_SILENCEDETECT_FILTER 0
 #define CONFIG_SILENCEREMOVE_FILTER 0
 #define CONFIG_TREBLE_FILTER 0
@@ -2499,6 +2583,7 @@
 #define CONFIG_ANULLSINK_FILTER 0
 #define CONFIG_ALPHAEXTRACT_FILTER 0
 #define CONFIG_ALPHAMERGE_FILTER 0
+#define CONFIG_ATADENOISE_FILTER 0
 #define CONFIG_ASS_FILTER 0
 #define CONFIG_BBOX_FILTER 0
 #define CONFIG_BLACKDETECT_FILTER 0
@@ -2508,6 +2593,7 @@
 #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_COPY_FILTER 0
@@ -2516,17 +2602,22 @@
 #define CONFIG_CROPDETECT_FILTER 0
 #define CONFIG_CURVES_FILTER 0
 #define CONFIG_DCTDNOIZ_FILTER 0
+#define CONFIG_DEBAND_FILTER 0
 #define CONFIG_DECIMATE_FILTER 0
+#define CONFIG_DEFLATE_FILTER 0
 #define CONFIG_DEJUDDER_FILTER 0
 #define CONFIG_DELOGO_FILTER 0
 #define CONFIG_DESHAKE_FILTER 0
 #define CONFIG_DETELECINE_FILTER 0
+#define CONFIG_DILATION_FILTER 0
 #define CONFIG_DRAWBOX_FILTER 0
+#define CONFIG_DRAWGRAPH_FILTER 0
 #define CONFIG_DRAWGRID_FILTER 0
 #define CONFIG_DRAWTEXT_FILTER 0
 #define CONFIG_EDGEDETECT_FILTER 0
 #define CONFIG_ELBG_FILTER 0
 #define CONFIG_EQ_FILTER 0
+#define CONFIG_EROSION_FILTER 0
 #define CONFIG_EXTRACTPLANES_FILTER 0
 #define CONFIG_FADE_FILTER 0
 #define CONFIG_FFTFILT_FILTER 0
@@ -2537,6 +2628,7 @@
 #define CONFIG_FORMAT_FILTER 0
 #define CONFIG_FPS_FILTER 0
 #define CONFIG_FRAMEPACK_FILTER 0
+#define CONFIG_FRAMERATE_FILTER 0
 #define CONFIG_FRAMESTEP_FILTER 0
 #define CONFIG_FREI0R_FILTER 0
 #define CONFIG_FSPP_FILTER 0
@@ -2548,9 +2640,11 @@
 #define CONFIG_HISTOGRAM_FILTER 0
 #define CONFIG_HQDN3D_FILTER 0
 #define CONFIG_HQX_FILTER 0
+#define CONFIG_HSTACK_FILTER 0
 #define CONFIG_HUE_FILTER 0
 #define CONFIG_IDET_FILTER 0
 #define CONFIG_IL_FILTER 0
+#define CONFIG_INFLATE_FILTER 0
 #define CONFIG_INTERLACE_FILTER 0
 #define CONFIG_INTERLEAVE_FILTER 0
 #define CONFIG_KERNDEINT_FILTER 0
@@ -2581,11 +2675,15 @@
 #define CONFIG_PSNR_FILTER 0
 #define CONFIG_PULLUP_FILTER 0
 #define CONFIG_QP_FILTER 0
+#define CONFIG_RANDOM_FILTER 0
+#define CONFIG_REMOVEGRAIN_FILTER 0
 #define CONFIG_REMOVELOGO_FILTER 0
 #define CONFIG_REPEATFIELDS_FILTER 0
+#define CONFIG_REVERSE_FILTER 0
 #define CONFIG_ROTATE_FILTER 0
 #define CONFIG_SAB_FILTER 0
 #define CONFIG_SCALE_FILTER 0
+#define CONFIG_SCALE2REF_FILTER 0
 #define CONFIG_SELECT_FILTER 0
 #define CONFIG_SENDCMD_FILTER 0
 #define CONFIG_SEPARATEFIELDS_FILTER 0
@@ -2601,6 +2699,7 @@
 #define CONFIG_SMARTBLUR_FILTER 0
 #define CONFIG_SPLIT_FILTER 0
 #define CONFIG_SPP_FILTER 0
+#define CONFIG_SSIM_FILTER 0
 #define CONFIG_STEREO3D_FILTER 0
 #define CONFIG_SUBTITLES_FILTER 0
 #define CONFIG_SUPER2XSAI_FILTER 0
@@ -2614,15 +2713,20 @@
 #define CONFIG_TRIM_FILTER 0
 #define CONFIG_UNSHARP_FILTER 0
 #define CONFIG_USPP_FILTER 0
+#define CONFIG_VECTORSCOPE_FILTER 0
 #define CONFIG_VFLIP_FILTER 0
 #define CONFIG_VIDSTABDETECT_FILTER 0
 #define CONFIG_VIDSTABTRANSFORM_FILTER 0
 #define CONFIG_VIGNETTE_FILTER 0
+#define CONFIG_VSTACK_FILTER 0
 #define CONFIG_W3FDIF_FILTER 0
+#define CONFIG_WAVEFORM_FILTER 0
 #define CONFIG_XBR_FILTER 0
 #define CONFIG_YADIF_FILTER 0
 #define CONFIG_ZMQ_FILTER 0
 #define CONFIG_ZOOMPAN_FILTER 0
+#define CONFIG_ALLRGB_FILTER 0
+#define CONFIG_ALLYUV_FILTER 0
 #define CONFIG_CELLAUTO_FILTER 0
 #define CONFIG_COLOR_FILTER 0
 #define CONFIG_FREI0R_SRC_FILTER 0
@@ -2636,16 +2740,21 @@
 #define CONFIG_SMPTEHDBARS_FILTER 0
 #define CONFIG_TESTSRC_FILTER 0
 #define CONFIG_NULLSINK_FILTER 0
+#define CONFIG_ADRAWGRAPH_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_SHOWVOLUME_FILTER 0
 #define CONFIG_SHOWWAVES_FILTER 0
 #define CONFIG_SHOWWAVESPIC_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
 #define CONFIG_H264_MMAL_HWACCEL 0
@@ -2654,21 +2763,30 @@
 #define CONFIG_H264_VDA_HWACCEL 0
 #define CONFIG_H264_VDA_OLD_HWACCEL 0
 #define CONFIG_H264_VDPAU_HWACCEL 0
+#define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0
 #define CONFIG_HEVC_D3D11VA_HWACCEL 0
 #define CONFIG_HEVC_DXVA2_HWACCEL 0
+#define CONFIG_HEVC_QSV_HWACCEL 0
+#define CONFIG_HEVC_VAAPI_HWACCEL 0
+#define CONFIG_HEVC_VDPAU_HWACCEL 0
 #define CONFIG_MPEG1_XVMC_HWACCEL 0
 #define CONFIG_MPEG1_VDPAU_HWACCEL 0
+#define CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL 0
 #define CONFIG_MPEG2_XVMC_HWACCEL 0
 #define CONFIG_MPEG2_D3D11VA_HWACCEL 0
 #define CONFIG_MPEG2_DXVA2_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_VAAPI_HWACCEL 0
 #define CONFIG_MPEG4_VDPAU_HWACCEL 0
+#define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
 #define CONFIG_VC1_D3D11VA_HWACCEL 0
 #define CONFIG_VC1_DXVA2_HWACCEL 0
 #define CONFIG_VC1_VAAPI_HWACCEL 0
 #define CONFIG_VC1_VDPAU_HWACCEL 0
+#define CONFIG_VC1_QSV_HWACCEL 0
 #define CONFIG_WMV3_D3D11VA_HWACCEL 0
 #define CONFIG_WMV3_DXVA2_HWACCEL 0
 #define CONFIG_WMV3_VAAPI_HWACCEL 0
@@ -2865,6 +2983,7 @@
 #define CONFIG_DVDSUB_PARSER 1
 #define CONFIG_DVD_NAV_PARSER 1
 #define CONFIG_FLAC_PARSER 1
+#define CONFIG_G729_PARSER 1
 #define CONFIG_GSM_PARSER 1
 #define CONFIG_H261_PARSER 1
 #define CONFIG_H263_PARSER 1
@@ -2886,6 +3005,7 @@
 #define CONFIG_VP3_PARSER 1
 #define CONFIG_VP8_PARSER 1
 #define CONFIG_VP9_PARSER 1
+#define CONFIG_ASYNC_PROTOCOL 1
 #define CONFIG_BLURAY_PROTOCOL 0
 #define CONFIG_CACHE_PROTOCOL 1
 #define CONFIG_CONCAT_PROTOCOL 1
diff --git a/android/include/config-x86.h b/android/include/config-x86.h
index fa64aaf13d..4d12d9e532 100644
--- a/android/include/config-x86.h
+++ b/android/include/config-x86.h
@@ -1,12 +1,12 @@
 /* Automatically generated by configure - do not modify! */
 #ifndef FFMPEG_CONFIG_H
 #define FFMPEG_CONFIG_H
-#define FFMPEG_CONFIGURATION "--arch=x86 --cpu=i686 --build_suffix= --cross-prefix=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.8/bin/x86_64-linux-android- --enable-cross-compile --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-x86 --target-os=linux --extra-cflags=-m32 --disable-static --enable-shared --enable-optimizations --disable-doc --disable-symver --disable-ffmpeg --disable-ffplay --disable-ffprobe --disable-ffserver --disable-avdevice --disable-devices --disable-filters --disable-demuxer=srt --disable-demuxer=microdvd --disable-demuxer=jacosub --disable-demuxer=sami --disable-demuxer=realtext --disable-demuxer=dts --disable-demuxer=subviewer --disable-demuxer=subviewer1 --disable-demuxer=pjs --disable-demuxer=vplayer --disable-demuxer=mpl2 --disable-decoder=ass --disable-decoder=srt --disable-decoder=subrip --disable-decoder=microdvd --disable-decoder=jacosub --disable-decoder=sami --disable-decoder=realtext --disable-decoder=movtext --disable-decoder=subviewer --disable-decoder=subviewer1 --disable-decoder=pjs --disable-decoder=vplayer --disable-decoder=mpl2 --enable-zlib --enable-pic --disable-debug"
+#define FFMPEG_CONFIGURATION "--arch=x86 --cpu=i686 --build_suffix= --cross-prefix=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android- --enable-cross-compile --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-x86 --target-os=linux --extra-cflags=-m32 --disable-static --enable-shared --enable-optimizations --disable-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 FFMPEG_DATADIR "/usr/local/share/ffmpeg"
 #define AVCONV_DATADIR "/usr/local/share/ffmpeg"
-#define CC_IDENT "gcc 4.8 (GCC)"
+#define CC_IDENT "gcc 4.9 (GCC) 20140827 (prerelease)"
 #define av_restrict restrict
 #define EXTERN_PREFIX ""
 #define EXTERN_ASM 
@@ -265,10 +265,18 @@
 #undef HAVE_MSA
 #endif
 #define HAVE_MSA 0
+#ifdef HAVE_LOONGSON2
+#undef HAVE_LOONGSON2
+#endif
+#define HAVE_LOONGSON2 1
 #ifdef HAVE_LOONGSON3
 #undef HAVE_LOONGSON3
 #endif
-#define HAVE_LOONGSON3 0
+#define HAVE_LOONGSON3 1
+#ifdef HAVE_MMI
+#undef HAVE_MMI
+#endif
+#define HAVE_MMI 0
 #ifdef HAVE_ARMV5TE_EXTERNAL
 #undef HAVE_ARMV5TE_EXTERNAL
 #endif
@@ -421,10 +429,18 @@
 #undef HAVE_MSA_EXTERNAL
 #endif
 #define HAVE_MSA_EXTERNAL 0
+#ifdef HAVE_LOONGSON2_EXTERNAL
+#undef HAVE_LOONGSON2_EXTERNAL
+#endif
+#define HAVE_LOONGSON2_EXTERNAL 0
 #ifdef HAVE_LOONGSON3_EXTERNAL
 #undef HAVE_LOONGSON3_EXTERNAL
 #endif
 #define HAVE_LOONGSON3_EXTERNAL 0
+#ifdef HAVE_MMI_EXTERNAL
+#undef HAVE_MMI_EXTERNAL
+#endif
+#define HAVE_MMI_EXTERNAL 0
 #ifdef HAVE_ARMV5TE_INLINE
 #undef HAVE_ARMV5TE_INLINE
 #endif
@@ -577,10 +593,18 @@
 #undef HAVE_MSA_INLINE
 #endif
 #define HAVE_MSA_INLINE 0
+#ifdef HAVE_LOONGSON2_INLINE
+#undef HAVE_LOONGSON2_INLINE
+#endif
+#define HAVE_LOONGSON2_INLINE 0
 #ifdef HAVE_LOONGSON3_INLINE
 #undef HAVE_LOONGSON3_INLINE
 #endif
 #define HAVE_LOONGSON3_INLINE 0
+#ifdef HAVE_MMI_INLINE
+#undef HAVE_MMI_INLINE
+#endif
+#define HAVE_MMI_INLINE 0
 #ifdef HAVE_ALIGNED_STACK
 #undef HAVE_ALIGNED_STACK
 #endif
@@ -729,6 +753,10 @@
 #undef HAVE_DIRECT_H
 #endif
 #define HAVE_DIRECT_H 0
+#ifdef HAVE_DIRENT_H
+#undef HAVE_DIRENT_H
+#endif
+#define HAVE_DIRENT_H 1
 #ifdef HAVE_DLFCN_H
 #undef HAVE_DLFCN_H
 #endif
@@ -865,10 +893,18 @@
 #undef HAVE_CBRTF
 #endif
 #define HAVE_CBRTF 1
+#ifdef HAVE_COPYSIGN
+#undef HAVE_COPYSIGN
+#endif
+#define HAVE_COPYSIGN 1
 #ifdef HAVE_COSF
 #undef HAVE_COSF
 #endif
 #define HAVE_COSF 1
+#ifdef HAVE_ERF
+#undef HAVE_ERF
+#endif
+#define HAVE_ERF 1
 #ifdef HAVE_EXP2
 #undef HAVE_EXP2
 #endif
@@ -1065,6 +1101,10 @@
 #undef HAVE_LOCALTIME_R
 #endif
 #define HAVE_LOCALTIME_R 1
+#ifdef HAVE_LSTAT
+#undef HAVE_LSTAT
+#endif
+#define HAVE_LSTAT 1
 #ifdef HAVE_LZO1X_999_COMPRESS
 #undef HAVE_LZO1X_999_COMPRESS
 #endif
@@ -1117,6 +1157,10 @@
 #undef HAVE_SETCONSOLETEXTATTRIBUTE
 #endif
 #define HAVE_SETCONSOLETEXTATTRIBUTE 0
+#ifdef HAVE_SETCONSOLECTRLHANDLER
+#undef HAVE_SETCONSOLECTRLHANDLER
+#endif
+#define HAVE_SETCONSOLECTRLHANDLER 0
 #ifdef HAVE_SETMODE
 #undef HAVE_SETMODE
 #endif
@@ -1261,6 +1305,10 @@
 #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
@@ -1394,7 +1442,7 @@
 #define CONFIG_PODPAGES 1
 #define CONFIG_TXTPAGES 0
 #define CONFIG_AVIO_READING_EXAMPLE 1
-#define CONFIG_AVIO_LIST_DIR_EXAMPLE 1
+#define CONFIG_AVIO_DIR_CMD_EXAMPLE 1
 #define CONFIG_DECODING_ENCODING_EXAMPLE 1
 #define CONFIG_DEMUXING_DECODING_EXAMPLE 1
 #define CONFIG_EXTRACT_MVS_EXAMPLE 1
@@ -1436,6 +1484,7 @@
 #define CONFIG_LIBGSM 0
 #define CONFIG_LIBIEC61883 0
 #define CONFIG_LIBILBC 0
+#define CONFIG_LIBKVAZAAR 0
 #define CONFIG_LIBMFX 0
 #define CONFIG_LIBMODPLUG 0
 #define CONFIG_LIBMP3LAME 0
@@ -1452,6 +1501,7 @@
 #define CONFIG_LIBSCHROEDINGER 0
 #define CONFIG_LIBSHINE 0
 #define CONFIG_LIBSMBCLIENT 0
+#define CONFIG_LIBSNAPPY 0
 #define CONFIG_LIBSOXR 0
 #define CONFIG_LIBSPEEX 0
 #define CONFIG_LIBSSH 0
@@ -1503,6 +1553,7 @@
 #define CONFIG_VAAPI 0
 #define CONFIG_VDA 0
 #define CONFIG_VDPAU 0
+#define CONFIG_VIDEOTOOLBOX 0
 #define CONFIG_XVMC 0
 #define CONFIG_GPL 0
 #define CONFIG_NONFREE 0
@@ -1555,8 +1606,10 @@
 #define CONFIG_FAANDCT 1
 #define CONFIG_FAANIDCT 1
 #define CONFIG_FDCTDSP 1
+#define CONFIG_FLACDSP 1
 #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
@@ -1574,7 +1627,9 @@
 #define CONFIG_IIRFILTER 1
 #define CONFIG_IMDCT15 1
 #define CONFIG_INTRAX8 1
+#define CONFIG_IVIDSP 1
 #define CONFIG_JPEGTABLES 1
+#define CONFIG_LIBX262 0
 #define CONFIG_LGPLV3 0
 #define CONFIG_LLAUDDSP 1
 #define CONFIG_LLVIDDSP 1
@@ -1585,6 +1640,7 @@
 #define CONFIG_MPEGAUDIODSP 1
 #define CONFIG_MPEGVIDEO 1
 #define CONFIG_MPEGVIDEOENC 1
+#define CONFIG_MSS34DSP 1
 #define CONFIG_PIXBLOCKDSP 1
 #define CONFIG_QPELDSP 1
 #define CONFIG_QSV 0
@@ -1595,16 +1651,24 @@
 #define CONFIG_RIFFENC 1
 #define CONFIG_RTPDEC 1
 #define CONFIG_RTPENC_CHAIN 1
+#define CONFIG_RV34DSP 1
 #define CONFIG_SINEWIN 1
+#define CONFIG_SNAPPY 1
 #define CONFIG_STARTCODE 1
+#define CONFIG_TEXTUREDSP 1
+#define CONFIG_TEXTUREDSPENC 0
 #define CONFIG_TPELDSP 1
 #define CONFIG_VIDEODSP 1
 #define CONFIG_VP3DSP 1
+#define CONFIG_VP56DSP 1
+#define CONFIG_VP8DSP 1
 #define CONFIG_WMA_FREQS 1
+#define CONFIG_WMV2DSP 1
 #define CONFIG_AAC_ADTSTOASC_BSF 1
 #define CONFIG_CHOMP_BSF 1
 #define CONFIG_DUMP_EXTRADATA_BSF 1
 #define CONFIG_H264_MP4TOANNEXB_BSF 1
+#define CONFIG_HEVC_MP4TOANNEXB_BSF 1
 #define CONFIG_IMX_DUMP_HEADER_BSF 1
 #define CONFIG_MJPEG2JPEG_BSF 1
 #define CONFIG_MJPEGA_DUMP_HEADER_BSF 1
@@ -1647,6 +1711,7 @@
 #define CONFIG_CPIA_DECODER 1
 #define CONFIG_CSCD_DECODER 1
 #define CONFIG_CYUV_DECODER 1
+#define CONFIG_DDS_DECODER 1
 #define CONFIG_DFA_DECODER 1
 #define CONFIG_DIRAC_DECODER 1
 #define CONFIG_DNXHD_DECODER 1
@@ -1688,7 +1753,9 @@
 #define CONFIG_H264_QSV_DECODER 0
 #define CONFIG_H264_VDA_DECODER 0
 #define CONFIG_H264_VDPAU_DECODER 0
+#define CONFIG_HAP_DECODER 1
 #define CONFIG_HEVC_DECODER 1
+#define CONFIG_HEVC_QSV_DECODER 0
 #define CONFIG_HNM4_VIDEO_DECODER 1
 #define CONFIG_HQ_HQA_DECODER 1
 #define CONFIG_HQX_DECODER 1
@@ -1724,6 +1791,7 @@
 #define CONFIG_MPEG_VDPAU_DECODER 0
 #define CONFIG_MPEG1_VDPAU_DECODER 0
 #define CONFIG_MPEG2_CRYSTALHD_DECODER 0
+#define CONFIG_MPEG2_QSV_DECODER 0
 #define CONFIG_MSA1_DECODER 1
 #define CONFIG_MSMPEG4_CRYSTALHD_DECODER 0
 #define CONFIG_MSMPEG4V1_DECODER 1
@@ -1802,6 +1870,7 @@
 #define CONFIG_VC1_CRYSTALHD_DECODER 0
 #define CONFIG_VC1_VDPAU_DECODER 0
 #define CONFIG_VC1IMAGE_DECODER 1
+#define CONFIG_VC1_QSV_DECODER 0
 #define CONFIG_VCR1_DECODER 1
 #define CONFIG_VMDVIDEO_DECODER 1
 #define CONFIG_VMNC_DECODER 1
@@ -1836,6 +1905,7 @@
 #define CONFIG_ZLIB_DECODER 1
 #define CONFIG_ZMBV_DECODER 1
 #define CONFIG_AAC_DECODER 1
+#define CONFIG_AAC_FIXED_DECODER 1
 #define CONFIG_AAC_LATM_DECODER 1
 #define CONFIG_AC3_DECODER 1
 #define CONFIG_AC3_FIXED_DECODER 1
@@ -1978,6 +2048,7 @@
 #define CONFIG_ADPCM_SBPRO_4_DECODER 1
 #define CONFIG_ADPCM_SWF_DECODER 1
 #define CONFIG_ADPCM_THP_DECODER 1
+#define CONFIG_ADPCM_THP_LE_DECODER 1
 #define CONFIG_ADPCM_VIMA_DECODER 1
 #define CONFIG_ADPCM_XA_DECODER 1
 #define CONFIG_ADPCM_YAMAHA_DECODER 1
@@ -2025,6 +2096,7 @@
 #define CONFIG_BINTEXT_DECODER 1
 #define CONFIG_XBIN_DECODER 1
 #define CONFIG_IDF_DECODER 1
+#define CONFIG_AA_DEMUXER 1
 #define CONFIG_AAC_DEMUXER 1
 #define CONFIG_AC3_DEMUXER 1
 #define CONFIG_ACT_DEMUXER 1
@@ -2041,6 +2113,7 @@
 #define CONFIG_APNG_DEMUXER 1
 #define CONFIG_AQTITLE_DEMUXER 1
 #define CONFIG_ASF_DEMUXER 1
+#define CONFIG_ASF_O_DEMUXER 1
 #define CONFIG_ASS_DEMUXER 1
 #define CONFIG_AST_DEMUXER 1
 #define CONFIG_AU_DEMUXER 1
@@ -2054,6 +2127,7 @@
 #define CONFIG_BINK_DEMUXER 1
 #define CONFIG_BIT_DEMUXER 1
 #define CONFIG_BMV_DEMUXER 1
+#define CONFIG_BFSTM_DEMUXER 1
 #define CONFIG_BRSTM_DEMUXER 1
 #define CONFIG_BOA_DEMUXER 1
 #define CONFIG_C93_DEMUXER 1
@@ -2250,6 +2324,7 @@
 #define CONFIG_YOP_DEMUXER 1
 #define CONFIG_YUV4MPEGPIPE_DEMUXER 1
 #define CONFIG_IMAGE_BMP_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_DDS_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_DPX_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_EXR_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_J2K_PIPE_DEMUXER 1
@@ -2292,6 +2367,7 @@
 #define CONFIG_H261_ENCODER 1
 #define CONFIG_H263_ENCODER 1
 #define CONFIG_H263P_ENCODER 1
+#define CONFIG_HAP_ENCODER 0
 #define CONFIG_HUFFYUV_ENCODER 1
 #define CONFIG_JPEG2000_ENCODER 1
 #define CONFIG_JPEGLS_ENCODER 1
@@ -2427,6 +2503,7 @@
 #define CONFIG_LIBWAVPACK_ENCODER 0
 #define CONFIG_LIBWEBP_ANIM_ENCODER 0
 #define CONFIG_LIBWEBP_ENCODER 0
+#define CONFIG_LIBX262_ENCODER 0
 #define CONFIG_LIBX264_ENCODER 0
 #define CONFIG_LIBX264RGB_ENCODER 0
 #define CONFIG_LIBX265_ENCODER 0
@@ -2438,6 +2515,10 @@
 #define CONFIG_NVENC_ENCODER 0
 #define CONFIG_NVENC_H264_ENCODER 0
 #define CONFIG_NVENC_HEVC_ENCODER 0
+#define CONFIG_HEVC_QSV_ENCODER 0
+#define CONFIG_LIBKVAZAAR_ENCODER 0
+#define CONFIG_MPEG2_QSV_ENCODER 0
+#define CONFIG_ACROSSFADE_FILTER 0
 #define CONFIG_ADELAY_FILTER 0
 #define CONFIG_AECHO_FILTER 0
 #define CONFIG_AEVAL_FILTER 0
@@ -2452,6 +2533,7 @@
 #define CONFIG_APERMS_FILTER 0
 #define CONFIG_APHASER_FILTER 0
 #define CONFIG_ARESAMPLE_FILTER 0
+#define CONFIG_AREVERSE_FILTER 0
 #define CONFIG_ASELECT_FILTER 0
 #define CONFIG_ASENDCMD_FILTER 0
 #define CONFIG_ASETNSAMPLES_FILTER 0
@@ -2476,6 +2558,7 @@
 #define CONFIG_CHORUS_FILTER 0
 #define CONFIG_COMPAND_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
@@ -2487,6 +2570,7 @@
 #define CONFIG_PAN_FILTER 0
 #define CONFIG_REPLAYGAIN_FILTER 0
 #define CONFIG_RESAMPLE_FILTER 0
+#define CONFIG_SIDECHAINCOMPRESS_FILTER 0
 #define CONFIG_SILENCEDETECT_FILTER 0
 #define CONFIG_SILENCEREMOVE_FILTER 0
 #define CONFIG_TREBLE_FILTER 0
@@ -2499,6 +2583,7 @@
 #define CONFIG_ANULLSINK_FILTER 0
 #define CONFIG_ALPHAEXTRACT_FILTER 0
 #define CONFIG_ALPHAMERGE_FILTER 0
+#define CONFIG_ATADENOISE_FILTER 0
 #define CONFIG_ASS_FILTER 0
 #define CONFIG_BBOX_FILTER 0
 #define CONFIG_BLACKDETECT_FILTER 0
@@ -2508,6 +2593,7 @@
 #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_COPY_FILTER 0
@@ -2516,17 +2602,22 @@
 #define CONFIG_CROPDETECT_FILTER 0
 #define CONFIG_CURVES_FILTER 0
 #define CONFIG_DCTDNOIZ_FILTER 0
+#define CONFIG_DEBAND_FILTER 0
 #define CONFIG_DECIMATE_FILTER 0
+#define CONFIG_DEFLATE_FILTER 0
 #define CONFIG_DEJUDDER_FILTER 0
 #define CONFIG_DELOGO_FILTER 0
 #define CONFIG_DESHAKE_FILTER 0
 #define CONFIG_DETELECINE_FILTER 0
+#define CONFIG_DILATION_FILTER 0
 #define CONFIG_DRAWBOX_FILTER 0
+#define CONFIG_DRAWGRAPH_FILTER 0
 #define CONFIG_DRAWGRID_FILTER 0
 #define CONFIG_DRAWTEXT_FILTER 0
 #define CONFIG_EDGEDETECT_FILTER 0
 #define CONFIG_ELBG_FILTER 0
 #define CONFIG_EQ_FILTER 0
+#define CONFIG_EROSION_FILTER 0
 #define CONFIG_EXTRACTPLANES_FILTER 0
 #define CONFIG_FADE_FILTER 0
 #define CONFIG_FFTFILT_FILTER 0
@@ -2537,6 +2628,7 @@
 #define CONFIG_FORMAT_FILTER 0
 #define CONFIG_FPS_FILTER 0
 #define CONFIG_FRAMEPACK_FILTER 0
+#define CONFIG_FRAMERATE_FILTER 0
 #define CONFIG_FRAMESTEP_FILTER 0
 #define CONFIG_FREI0R_FILTER 0
 #define CONFIG_FSPP_FILTER 0
@@ -2548,9 +2640,11 @@
 #define CONFIG_HISTOGRAM_FILTER 0
 #define CONFIG_HQDN3D_FILTER 0
 #define CONFIG_HQX_FILTER 0
+#define CONFIG_HSTACK_FILTER 0
 #define CONFIG_HUE_FILTER 0
 #define CONFIG_IDET_FILTER 0
 #define CONFIG_IL_FILTER 0
+#define CONFIG_INFLATE_FILTER 0
 #define CONFIG_INTERLACE_FILTER 0
 #define CONFIG_INTERLEAVE_FILTER 0
 #define CONFIG_KERNDEINT_FILTER 0
@@ -2581,11 +2675,15 @@
 #define CONFIG_PSNR_FILTER 0
 #define CONFIG_PULLUP_FILTER 0
 #define CONFIG_QP_FILTER 0
+#define CONFIG_RANDOM_FILTER 0
+#define CONFIG_REMOVEGRAIN_FILTER 0
 #define CONFIG_REMOVELOGO_FILTER 0
 #define CONFIG_REPEATFIELDS_FILTER 0
+#define CONFIG_REVERSE_FILTER 0
 #define CONFIG_ROTATE_FILTER 0
 #define CONFIG_SAB_FILTER 0
 #define CONFIG_SCALE_FILTER 0
+#define CONFIG_SCALE2REF_FILTER 0
 #define CONFIG_SELECT_FILTER 0
 #define CONFIG_SENDCMD_FILTER 0
 #define CONFIG_SEPARATEFIELDS_FILTER 0
@@ -2601,6 +2699,7 @@
 #define CONFIG_SMARTBLUR_FILTER 0
 #define CONFIG_SPLIT_FILTER 0
 #define CONFIG_SPP_FILTER 0
+#define CONFIG_SSIM_FILTER 0
 #define CONFIG_STEREO3D_FILTER 0
 #define CONFIG_SUBTITLES_FILTER 0
 #define CONFIG_SUPER2XSAI_FILTER 0
@@ -2614,15 +2713,20 @@
 #define CONFIG_TRIM_FILTER 0
 #define CONFIG_UNSHARP_FILTER 0
 #define CONFIG_USPP_FILTER 0
+#define CONFIG_VECTORSCOPE_FILTER 0
 #define CONFIG_VFLIP_FILTER 0
 #define CONFIG_VIDSTABDETECT_FILTER 0
 #define CONFIG_VIDSTABTRANSFORM_FILTER 0
 #define CONFIG_VIGNETTE_FILTER 0
+#define CONFIG_VSTACK_FILTER 0
 #define CONFIG_W3FDIF_FILTER 0
+#define CONFIG_WAVEFORM_FILTER 0
 #define CONFIG_XBR_FILTER 0
 #define CONFIG_YADIF_FILTER 0
 #define CONFIG_ZMQ_FILTER 0
 #define CONFIG_ZOOMPAN_FILTER 0
+#define CONFIG_ALLRGB_FILTER 0
+#define CONFIG_ALLYUV_FILTER 0
 #define CONFIG_CELLAUTO_FILTER 0
 #define CONFIG_COLOR_FILTER 0
 #define CONFIG_FREI0R_SRC_FILTER 0
@@ -2636,16 +2740,21 @@
 #define CONFIG_SMPTEHDBARS_FILTER 0
 #define CONFIG_TESTSRC_FILTER 0
 #define CONFIG_NULLSINK_FILTER 0
+#define CONFIG_ADRAWGRAPH_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_SHOWVOLUME_FILTER 0
 #define CONFIG_SHOWWAVES_FILTER 0
 #define CONFIG_SHOWWAVESPIC_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
 #define CONFIG_H264_MMAL_HWACCEL 0
@@ -2654,21 +2763,30 @@
 #define CONFIG_H264_VDA_HWACCEL 0
 #define CONFIG_H264_VDA_OLD_HWACCEL 0
 #define CONFIG_H264_VDPAU_HWACCEL 0
+#define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0
 #define CONFIG_HEVC_D3D11VA_HWACCEL 0
 #define CONFIG_HEVC_DXVA2_HWACCEL 0
+#define CONFIG_HEVC_QSV_HWACCEL 0
+#define CONFIG_HEVC_VAAPI_HWACCEL 0
+#define CONFIG_HEVC_VDPAU_HWACCEL 0
 #define CONFIG_MPEG1_XVMC_HWACCEL 0
 #define CONFIG_MPEG1_VDPAU_HWACCEL 0
+#define CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL 0
 #define CONFIG_MPEG2_XVMC_HWACCEL 0
 #define CONFIG_MPEG2_D3D11VA_HWACCEL 0
 #define CONFIG_MPEG2_DXVA2_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_VAAPI_HWACCEL 0
 #define CONFIG_MPEG4_VDPAU_HWACCEL 0
+#define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
 #define CONFIG_VC1_D3D11VA_HWACCEL 0
 #define CONFIG_VC1_DXVA2_HWACCEL 0
 #define CONFIG_VC1_VAAPI_HWACCEL 0
 #define CONFIG_VC1_VDPAU_HWACCEL 0
+#define CONFIG_VC1_QSV_HWACCEL 0
 #define CONFIG_WMV3_D3D11VA_HWACCEL 0
 #define CONFIG_WMV3_DXVA2_HWACCEL 0
 #define CONFIG_WMV3_VAAPI_HWACCEL 0
@@ -2865,6 +2983,7 @@
 #define CONFIG_DVDSUB_PARSER 1
 #define CONFIG_DVD_NAV_PARSER 1
 #define CONFIG_FLAC_PARSER 1
+#define CONFIG_G729_PARSER 1
 #define CONFIG_GSM_PARSER 1
 #define CONFIG_H261_PARSER 1
 #define CONFIG_H263_PARSER 1
@@ -2886,6 +3005,7 @@
 #define CONFIG_VP3_PARSER 1
 #define CONFIG_VP8_PARSER 1
 #define CONFIG_VP9_PARSER 1
+#define CONFIG_ASYNC_PROTOCOL 1
 #define CONFIG_BLURAY_PROTOCOL 0
 #define CONFIG_CACHE_PROTOCOL 1
 #define CONFIG_CONCAT_PROTOCOL 1
diff --git a/android/include/config.asm b/android/include/config.asm
index 7ea9e276a5..59bbfa9505 100644
--- a/android/include/config.asm
+++ b/android/include/config.asm
@@ -60,7 +60,9 @@
 %define HAVE_MIPSDSPR1 0
 %define HAVE_MIPSDSPR2 0
 %define HAVE_MSA 0
-%define HAVE_LOONGSON3 0
+%define HAVE_LOONGSON2 1
+%define HAVE_LOONGSON3 1
+%define HAVE_MMI 0
 %define HAVE_ARMV5TE_EXTERNAL 0
 %define HAVE_ARMV6_EXTERNAL 0
 %define HAVE_ARMV6T2_EXTERNAL 0
@@ -99,7 +101,9 @@
 %define HAVE_MIPSDSPR1_EXTERNAL 0
 %define HAVE_MIPSDSPR2_EXTERNAL 0
 %define HAVE_MSA_EXTERNAL 0
+%define HAVE_LOONGSON2_EXTERNAL 0
 %define HAVE_LOONGSON3_EXTERNAL 0
+%define HAVE_MMI_EXTERNAL 0
 %define HAVE_ARMV5TE_INLINE 0
 %define HAVE_ARMV6_INLINE 0
 %define HAVE_ARMV6T2_INLINE 0
@@ -138,7 +142,9 @@
 %define HAVE_MIPSDSPR1_INLINE 0
 %define HAVE_MIPSDSPR2_INLINE 0
 %define HAVE_MSA_INLINE 0
+%define HAVE_LOONGSON2_INLINE 0
 %define HAVE_LOONGSON3_INLINE 0
+%define HAVE_MMI_INLINE 0
 %define HAVE_ALIGNED_STACK 1
 %define HAVE_FAST_64BIT 0
 %define HAVE_FAST_CLZ 1
@@ -176,6 +182,7 @@
 %define HAVE_DEV_VIDEO_BKTR_IOCTL_BT848_H 0
 %define HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H 0
 %define HAVE_DIRECT_H 0
+%define HAVE_DIRENT_H 1
 %define HAVE_DLFCN_H 1
 %define HAVE_D3D11_H 0
 %define HAVE_DXVA_H 0
@@ -210,7 +217,9 @@
 %define HAVE_ATAN2F 1
 %define HAVE_CBRT 1
 %define HAVE_CBRTF 1
+%define HAVE_COPYSIGN 1
 %define HAVE_COSF 1
+%define HAVE_ERF 1
 %define HAVE_EXP2 1
 %define HAVE_EXP2F 1
 %define HAVE_EXPF 1
@@ -260,6 +269,7 @@
 %define HAVE_JACK_PORT_GET_LATENCY_RANGE 0
 %define HAVE_KBHIT 0
 %define HAVE_LOCALTIME_R 1
+%define HAVE_LSTAT 1
 %define HAVE_LZO1X_999_COMPRESS 0
 %define HAVE_MACH_ABSOLUTE_TIME 0
 %define HAVE_MAPVIEWOFFILE 0
@@ -273,6 +283,7 @@
 %define HAVE_PTHREAD_CANCEL 0
 %define HAVE_SCHED_GETAFFINITY 1
 %define HAVE_SETCONSOLETEXTATTRIBUTE 0
+%define HAVE_SETCONSOLECTRLHANDLER 0
 %define HAVE_SETMODE 0
 %define HAVE_SETRLIMIT 1
 %define HAVE_SLEEP 0
@@ -309,6 +320,7 @@
 %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
@@ -355,7 +367,7 @@
 %define CONFIG_PODPAGES 1
 %define CONFIG_TXTPAGES 0
 %define CONFIG_AVIO_READING_EXAMPLE 1
-%define CONFIG_AVIO_LIST_DIR_EXAMPLE 1
+%define CONFIG_AVIO_DIR_CMD_EXAMPLE 1
 %define CONFIG_DECODING_ENCODING_EXAMPLE 1
 %define CONFIG_DEMUXING_DECODING_EXAMPLE 1
 %define CONFIG_EXTRACT_MVS_EXAMPLE 1
@@ -397,6 +409,7 @@
 %define CONFIG_LIBGSM 0
 %define CONFIG_LIBIEC61883 0
 %define CONFIG_LIBILBC 0
+%define CONFIG_LIBKVAZAAR 0
 %define CONFIG_LIBMFX 0
 %define CONFIG_LIBMODPLUG 0
 %define CONFIG_LIBMP3LAME 0
@@ -413,6 +426,7 @@
 %define CONFIG_LIBSCHROEDINGER 0
 %define CONFIG_LIBSHINE 0
 %define CONFIG_LIBSMBCLIENT 0
+%define CONFIG_LIBSNAPPY 0
 %define CONFIG_LIBSOXR 0
 %define CONFIG_LIBSPEEX 0
 %define CONFIG_LIBSSH 0
@@ -464,6 +478,7 @@
 %define CONFIG_VAAPI 0
 %define CONFIG_VDA 0
 %define CONFIG_VDPAU 0
+%define CONFIG_VIDEOTOOLBOX 0
 %define CONFIG_XVMC 0
 %define CONFIG_GPL 0
 %define CONFIG_NONFREE 0
@@ -516,8 +531,10 @@
 %define CONFIG_FAANDCT 1
 %define CONFIG_FAANIDCT 1
 %define CONFIG_FDCTDSP 1
+%define CONFIG_FLACDSP 1
 %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
@@ -535,7 +552,9 @@
 %define CONFIG_IIRFILTER 1
 %define CONFIG_IMDCT15 1
 %define CONFIG_INTRAX8 1
+%define CONFIG_IVIDSP 1
 %define CONFIG_JPEGTABLES 1
+%define CONFIG_LIBX262 0
 %define CONFIG_LGPLV3 0
 %define CONFIG_LLAUDDSP 1
 %define CONFIG_LLVIDDSP 1
@@ -546,6 +565,7 @@
 %define CONFIG_MPEGAUDIODSP 1
 %define CONFIG_MPEGVIDEO 1
 %define CONFIG_MPEGVIDEOENC 1
+%define CONFIG_MSS34DSP 1
 %define CONFIG_PIXBLOCKDSP 1
 %define CONFIG_QPELDSP 1
 %define CONFIG_QSV 0
@@ -556,16 +576,24 @@
 %define CONFIG_RIFFENC 1
 %define CONFIG_RTPDEC 1
 %define CONFIG_RTPENC_CHAIN 1
+%define CONFIG_RV34DSP 1
 %define CONFIG_SINEWIN 1
+%define CONFIG_SNAPPY 1
 %define CONFIG_STARTCODE 1
+%define CONFIG_TEXTUREDSP 1
+%define CONFIG_TEXTUREDSPENC 0
 %define CONFIG_TPELDSP 1
 %define CONFIG_VIDEODSP 1
 %define CONFIG_VP3DSP 1
+%define CONFIG_VP56DSP 1
+%define CONFIG_VP8DSP 1
 %define CONFIG_WMA_FREQS 1
+%define CONFIG_WMV2DSP 1
 %define CONFIG_AAC_ADTSTOASC_BSF 1
 %define CONFIG_CHOMP_BSF 1
 %define CONFIG_DUMP_EXTRADATA_BSF 1
 %define CONFIG_H264_MP4TOANNEXB_BSF 1
+%define CONFIG_HEVC_MP4TOANNEXB_BSF 1
 %define CONFIG_IMX_DUMP_HEADER_BSF 1
 %define CONFIG_MJPEG2JPEG_BSF 1
 %define CONFIG_MJPEGA_DUMP_HEADER_BSF 1
@@ -608,6 +636,7 @@
 %define CONFIG_CPIA_DECODER 1
 %define CONFIG_CSCD_DECODER 1
 %define CONFIG_CYUV_DECODER 1
+%define CONFIG_DDS_DECODER 1
 %define CONFIG_DFA_DECODER 1
 %define CONFIG_DIRAC_DECODER 1
 %define CONFIG_DNXHD_DECODER 1
@@ -649,7 +678,9 @@
 %define CONFIG_H264_QSV_DECODER 0
 %define CONFIG_H264_VDA_DECODER 0
 %define CONFIG_H264_VDPAU_DECODER 0
+%define CONFIG_HAP_DECODER 1
 %define CONFIG_HEVC_DECODER 1
+%define CONFIG_HEVC_QSV_DECODER 0
 %define CONFIG_HNM4_VIDEO_DECODER 1
 %define CONFIG_HQ_HQA_DECODER 1
 %define CONFIG_HQX_DECODER 1
@@ -685,6 +716,7 @@
 %define CONFIG_MPEG_VDPAU_DECODER 0
 %define CONFIG_MPEG1_VDPAU_DECODER 0
 %define CONFIG_MPEG2_CRYSTALHD_DECODER 0
+%define CONFIG_MPEG2_QSV_DECODER 0
 %define CONFIG_MSA1_DECODER 1
 %define CONFIG_MSMPEG4_CRYSTALHD_DECODER 0
 %define CONFIG_MSMPEG4V1_DECODER 1
@@ -763,6 +795,7 @@
 %define CONFIG_VC1_CRYSTALHD_DECODER 0
 %define CONFIG_VC1_VDPAU_DECODER 0
 %define CONFIG_VC1IMAGE_DECODER 1
+%define CONFIG_VC1_QSV_DECODER 0
 %define CONFIG_VCR1_DECODER 1
 %define CONFIG_VMDVIDEO_DECODER 1
 %define CONFIG_VMNC_DECODER 1
@@ -797,6 +830,7 @@
 %define CONFIG_ZLIB_DECODER 1
 %define CONFIG_ZMBV_DECODER 1
 %define CONFIG_AAC_DECODER 1
+%define CONFIG_AAC_FIXED_DECODER 1
 %define CONFIG_AAC_LATM_DECODER 1
 %define CONFIG_AC3_DECODER 1
 %define CONFIG_AC3_FIXED_DECODER 1
@@ -939,6 +973,7 @@
 %define CONFIG_ADPCM_SBPRO_4_DECODER 1
 %define CONFIG_ADPCM_SWF_DECODER 1
 %define CONFIG_ADPCM_THP_DECODER 1
+%define CONFIG_ADPCM_THP_LE_DECODER 1
 %define CONFIG_ADPCM_VIMA_DECODER 1
 %define CONFIG_ADPCM_XA_DECODER 1
 %define CONFIG_ADPCM_YAMAHA_DECODER 1
@@ -986,6 +1021,7 @@
 %define CONFIG_BINTEXT_DECODER 1
 %define CONFIG_XBIN_DECODER 1
 %define CONFIG_IDF_DECODER 1
+%define CONFIG_AA_DEMUXER 1
 %define CONFIG_AAC_DEMUXER 1
 %define CONFIG_AC3_DEMUXER 1
 %define CONFIG_ACT_DEMUXER 1
@@ -1002,6 +1038,7 @@
 %define CONFIG_APNG_DEMUXER 1
 %define CONFIG_AQTITLE_DEMUXER 1
 %define CONFIG_ASF_DEMUXER 1
+%define CONFIG_ASF_O_DEMUXER 1
 %define CONFIG_ASS_DEMUXER 1
 %define CONFIG_AST_DEMUXER 1
 %define CONFIG_AU_DEMUXER 1
@@ -1015,6 +1052,7 @@
 %define CONFIG_BINK_DEMUXER 1
 %define CONFIG_BIT_DEMUXER 1
 %define CONFIG_BMV_DEMUXER 1
+%define CONFIG_BFSTM_DEMUXER 1
 %define CONFIG_BRSTM_DEMUXER 1
 %define CONFIG_BOA_DEMUXER 1
 %define CONFIG_C93_DEMUXER 1
@@ -1211,6 +1249,7 @@
 %define CONFIG_YOP_DEMUXER 1
 %define CONFIG_YUV4MPEGPIPE_DEMUXER 1
 %define CONFIG_IMAGE_BMP_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_DDS_PIPE_DEMUXER 1
 %define CONFIG_IMAGE_DPX_PIPE_DEMUXER 1
 %define CONFIG_IMAGE_EXR_PIPE_DEMUXER 1
 %define CONFIG_IMAGE_J2K_PIPE_DEMUXER 1
@@ -1253,6 +1292,7 @@
 %define CONFIG_H261_ENCODER 1
 %define CONFIG_H263_ENCODER 1
 %define CONFIG_H263P_ENCODER 1
+%define CONFIG_HAP_ENCODER 0
 %define CONFIG_HUFFYUV_ENCODER 1
 %define CONFIG_JPEG2000_ENCODER 1
 %define CONFIG_JPEGLS_ENCODER 1
@@ -1388,6 +1428,7 @@
 %define CONFIG_LIBWAVPACK_ENCODER 0
 %define CONFIG_LIBWEBP_ANIM_ENCODER 0
 %define CONFIG_LIBWEBP_ENCODER 0
+%define CONFIG_LIBX262_ENCODER 0
 %define CONFIG_LIBX264_ENCODER 0
 %define CONFIG_LIBX264RGB_ENCODER 0
 %define CONFIG_LIBX265_ENCODER 0
@@ -1399,6 +1440,10 @@
 %define CONFIG_NVENC_ENCODER 0
 %define CONFIG_NVENC_H264_ENCODER 0
 %define CONFIG_NVENC_HEVC_ENCODER 0
+%define CONFIG_HEVC_QSV_ENCODER 0
+%define CONFIG_LIBKVAZAAR_ENCODER 0
+%define CONFIG_MPEG2_QSV_ENCODER 0
+%define CONFIG_ACROSSFADE_FILTER 0
 %define CONFIG_ADELAY_FILTER 0
 %define CONFIG_AECHO_FILTER 0
 %define CONFIG_AEVAL_FILTER 0
@@ -1413,6 +1458,7 @@
 %define CONFIG_APERMS_FILTER 0
 %define CONFIG_APHASER_FILTER 0
 %define CONFIG_ARESAMPLE_FILTER 0
+%define CONFIG_AREVERSE_FILTER 0
 %define CONFIG_ASELECT_FILTER 0
 %define CONFIG_ASENDCMD_FILTER 0
 %define CONFIG_ASETNSAMPLES_FILTER 0
@@ -1437,6 +1483,7 @@
 %define CONFIG_CHORUS_FILTER 0
 %define CONFIG_COMPAND_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
@@ -1448,6 +1495,7 @@
 %define CONFIG_PAN_FILTER 0
 %define CONFIG_REPLAYGAIN_FILTER 0
 %define CONFIG_RESAMPLE_FILTER 0
+%define CONFIG_SIDECHAINCOMPRESS_FILTER 0
 %define CONFIG_SILENCEDETECT_FILTER 0
 %define CONFIG_SILENCEREMOVE_FILTER 0
 %define CONFIG_TREBLE_FILTER 0
@@ -1460,6 +1508,7 @@
 %define CONFIG_ANULLSINK_FILTER 0
 %define CONFIG_ALPHAEXTRACT_FILTER 0
 %define CONFIG_ALPHAMERGE_FILTER 0
+%define CONFIG_ATADENOISE_FILTER 0
 %define CONFIG_ASS_FILTER 0
 %define CONFIG_BBOX_FILTER 0
 %define CONFIG_BLACKDETECT_FILTER 0
@@ -1469,6 +1518,7 @@
 %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_COPY_FILTER 0
@@ -1477,17 +1527,22 @@
 %define CONFIG_CROPDETECT_FILTER 0
 %define CONFIG_CURVES_FILTER 0
 %define CONFIG_DCTDNOIZ_FILTER 0
+%define CONFIG_DEBAND_FILTER 0
 %define CONFIG_DECIMATE_FILTER 0
+%define CONFIG_DEFLATE_FILTER 0
 %define CONFIG_DEJUDDER_FILTER 0
 %define CONFIG_DELOGO_FILTER 0
 %define CONFIG_DESHAKE_FILTER 0
 %define CONFIG_DETELECINE_FILTER 0
+%define CONFIG_DILATION_FILTER 0
 %define CONFIG_DRAWBOX_FILTER 0
+%define CONFIG_DRAWGRAPH_FILTER 0
 %define CONFIG_DRAWGRID_FILTER 0
 %define CONFIG_DRAWTEXT_FILTER 0
 %define CONFIG_EDGEDETECT_FILTER 0
 %define CONFIG_ELBG_FILTER 0
 %define CONFIG_EQ_FILTER 0
+%define CONFIG_EROSION_FILTER 0
 %define CONFIG_EXTRACTPLANES_FILTER 0
 %define CONFIG_FADE_FILTER 0
 %define CONFIG_FFTFILT_FILTER 0
@@ -1498,6 +1553,7 @@
 %define CONFIG_FORMAT_FILTER 0
 %define CONFIG_FPS_FILTER 0
 %define CONFIG_FRAMEPACK_FILTER 0
+%define CONFIG_FRAMERATE_FILTER 0
 %define CONFIG_FRAMESTEP_FILTER 0
 %define CONFIG_FREI0R_FILTER 0
 %define CONFIG_FSPP_FILTER 0
@@ -1509,9 +1565,11 @@
 %define CONFIG_HISTOGRAM_FILTER 0
 %define CONFIG_HQDN3D_FILTER 0
 %define CONFIG_HQX_FILTER 0
+%define CONFIG_HSTACK_FILTER 0
 %define CONFIG_HUE_FILTER 0
 %define CONFIG_IDET_FILTER 0
 %define CONFIG_IL_FILTER 0
+%define CONFIG_INFLATE_FILTER 0
 %define CONFIG_INTERLACE_FILTER 0
 %define CONFIG_INTERLEAVE_FILTER 0
 %define CONFIG_KERNDEINT_FILTER 0
@@ -1542,11 +1600,15 @@
 %define CONFIG_PSNR_FILTER 0
 %define CONFIG_PULLUP_FILTER 0
 %define CONFIG_QP_FILTER 0
+%define CONFIG_RANDOM_FILTER 0
+%define CONFIG_REMOVEGRAIN_FILTER 0
 %define CONFIG_REMOVELOGO_FILTER 0
 %define CONFIG_REPEATFIELDS_FILTER 0
+%define CONFIG_REVERSE_FILTER 0
 %define CONFIG_ROTATE_FILTER 0
 %define CONFIG_SAB_FILTER 0
 %define CONFIG_SCALE_FILTER 0
+%define CONFIG_SCALE2REF_FILTER 0
 %define CONFIG_SELECT_FILTER 0
 %define CONFIG_SENDCMD_FILTER 0
 %define CONFIG_SEPARATEFIELDS_FILTER 0
@@ -1562,6 +1624,7 @@
 %define CONFIG_SMARTBLUR_FILTER 0
 %define CONFIG_SPLIT_FILTER 0
 %define CONFIG_SPP_FILTER 0
+%define CONFIG_SSIM_FILTER 0
 %define CONFIG_STEREO3D_FILTER 0
 %define CONFIG_SUBTITLES_FILTER 0
 %define CONFIG_SUPER2XSAI_FILTER 0
@@ -1575,15 +1638,20 @@
 %define CONFIG_TRIM_FILTER 0
 %define CONFIG_UNSHARP_FILTER 0
 %define CONFIG_USPP_FILTER 0
+%define CONFIG_VECTORSCOPE_FILTER 0
 %define CONFIG_VFLIP_FILTER 0
 %define CONFIG_VIDSTABDETECT_FILTER 0
 %define CONFIG_VIDSTABTRANSFORM_FILTER 0
 %define CONFIG_VIGNETTE_FILTER 0
+%define CONFIG_VSTACK_FILTER 0
 %define CONFIG_W3FDIF_FILTER 0
+%define CONFIG_WAVEFORM_FILTER 0
 %define CONFIG_XBR_FILTER 0
 %define CONFIG_YADIF_FILTER 0
 %define CONFIG_ZMQ_FILTER 0
 %define CONFIG_ZOOMPAN_FILTER 0
+%define CONFIG_ALLRGB_FILTER 0
+%define CONFIG_ALLYUV_FILTER 0
 %define CONFIG_CELLAUTO_FILTER 0
 %define CONFIG_COLOR_FILTER 0
 %define CONFIG_FREI0R_SRC_FILTER 0
@@ -1597,16 +1665,21 @@
 %define CONFIG_SMPTEHDBARS_FILTER 0
 %define CONFIG_TESTSRC_FILTER 0
 %define CONFIG_NULLSINK_FILTER 0
+%define CONFIG_ADRAWGRAPH_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_SHOWVOLUME_FILTER 0
 %define CONFIG_SHOWWAVES_FILTER 0
 %define CONFIG_SHOWWAVESPIC_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
 %define CONFIG_H264_MMAL_HWACCEL 0
@@ -1615,21 +1688,30 @@
 %define CONFIG_H264_VDA_HWACCEL 0
 %define CONFIG_H264_VDA_OLD_HWACCEL 0
 %define CONFIG_H264_VDPAU_HWACCEL 0
+%define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0
 %define CONFIG_HEVC_D3D11VA_HWACCEL 0
 %define CONFIG_HEVC_DXVA2_HWACCEL 0
+%define CONFIG_HEVC_QSV_HWACCEL 0
+%define CONFIG_HEVC_VAAPI_HWACCEL 0
+%define CONFIG_HEVC_VDPAU_HWACCEL 0
 %define CONFIG_MPEG1_XVMC_HWACCEL 0
 %define CONFIG_MPEG1_VDPAU_HWACCEL 0
+%define CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL 0
 %define CONFIG_MPEG2_XVMC_HWACCEL 0
 %define CONFIG_MPEG2_D3D11VA_HWACCEL 0
 %define CONFIG_MPEG2_DXVA2_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_VAAPI_HWACCEL 0
 %define CONFIG_MPEG4_VDPAU_HWACCEL 0
+%define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
 %define CONFIG_VC1_D3D11VA_HWACCEL 0
 %define CONFIG_VC1_DXVA2_HWACCEL 0
 %define CONFIG_VC1_VAAPI_HWACCEL 0
 %define CONFIG_VC1_VDPAU_HWACCEL 0
+%define CONFIG_VC1_QSV_HWACCEL 0
 %define CONFIG_WMV3_D3D11VA_HWACCEL 0
 %define CONFIG_WMV3_DXVA2_HWACCEL 0
 %define CONFIG_WMV3_VAAPI_HWACCEL 0
@@ -1826,6 +1908,7 @@
 %define CONFIG_DVDSUB_PARSER 1
 %define CONFIG_DVD_NAV_PARSER 1
 %define CONFIG_FLAC_PARSER 1
+%define CONFIG_G729_PARSER 1
 %define CONFIG_GSM_PARSER 1
 %define CONFIG_H261_PARSER 1
 %define CONFIG_H263_PARSER 1
@@ -1847,6 +1930,7 @@
 %define CONFIG_VP3_PARSER 1
 %define CONFIG_VP8_PARSER 1
 %define CONFIG_VP9_PARSER 1
+%define CONFIG_ASYNC_PROTOCOL 1
 %define CONFIG_BLURAY_PROTOCOL 0
 %define CONFIG_CACHE_PROTOCOL 1
 %define CONFIG_CONCAT_PROTOCOL 1