Update dependencies

2014-11-29 09:54:53 -08:00 · 2014-11-29 09:54:53 -08:00 · 9a4ffe762a
parent 5013742747
commit 9a4ffe762a
11 changed files with 463 additions and 71 deletions
--- a/build/ffmpeg/config-x64.asm
+++ b/build/ffmpeg/config-x64.asm
@ -29,10 +29,12 @@
 %define HAVE_NEON 0
 %define HAVE_VFP 0
 %define HAVE_VFPV3 0
+%define HAVE_SETEND 0
 %define HAVE_ALTIVEC 0
 %define HAVE_DCBZL 1
 %define HAVE_LDBRX 1
 %define HAVE_PPC4XX 0
+%define HAVE_VSX 0
 %define HAVE_AMD3DNOW 1
 %define HAVE_AMD3DNOWEXT 1
 %define HAVE_AVX 1
@ -62,10 +64,12 @@
 %define HAVE_NEON_EXTERNAL 0
 %define HAVE_VFP_EXTERNAL 0
 %define HAVE_VFPV3_EXTERNAL 0
+%define HAVE_SETEND_EXTERNAL 0
 %define HAVE_ALTIVEC_EXTERNAL 0
 %define HAVE_DCBZL_EXTERNAL 0
 %define HAVE_LDBRX_EXTERNAL 0
 %define HAVE_PPC4XX_EXTERNAL 0
+%define HAVE_VSX_EXTERNAL 0
 %define HAVE_AMD3DNOW_EXTERNAL 1
 %define HAVE_AMD3DNOWEXT_EXTERNAL 1
 %define HAVE_AVX_EXTERNAL 1
@ -95,10 +99,12 @@
 %define HAVE_NEON_INLINE 0
 %define HAVE_VFP_INLINE 0
 %define HAVE_VFPV3_INLINE 0
+%define HAVE_SETEND_INLINE 0
 %define HAVE_ALTIVEC_INLINE 0
 %define HAVE_DCBZL_INLINE 0
 %define HAVE_LDBRX_INLINE 0
 %define HAVE_PPC4XX_INLINE 0
+%define HAVE_VSX_INLINE 0
 %define HAVE_AMD3DNOW_INLINE 0
 %define HAVE_AMD3DNOWEXT_INLINE 0
 %define HAVE_AVX_INLINE 0
@ -128,10 +134,12 @@
 %define HAVE_LOCAL_ALIGNED_8 1
 %define HAVE_LOCAL_ALIGNED_16 1
 %define HAVE_LOCAL_ALIGNED_32 1
+%define HAVE_SIMD_ALIGN_16 1
 %define HAVE_ATOMICS_GCC 0
 %define HAVE_ATOMICS_SUNCC 0
 %define HAVE_ATOMICS_WIN32 1
 %define HAVE_ATOMIC_CAS_PTR 0
+%define HAVE_ATOMIC_COMPARE_EXCHANGE 0
 %define HAVE_MACHINE_RW_BARRIER 0
 %define HAVE_MEMORYBARRIER 1
 %define HAVE_MM_EMPTY 0
@ -180,9 +188,11 @@
 %define HAVE_SYS_UN_H 0
 %define HAVE_SYS_VIDEOIO_H 0
 %define HAVE_TERMIOS_H 0
+%define HAVE_UDPLITE_H 0
 %define HAVE_UNISTD_H 0
 %define HAVE_WINDOWS_H 1
 %define HAVE_WINSOCK2_H 0
+%define HAVE_INTRINSICS_NEON 0
 %define HAVE_ATANF 1
 %define HAVE_ATAN2F 1
 %define HAVE_CBRT 1
@ -191,7 +201,6 @@
 %define HAVE_EXP2 1
 %define HAVE_EXP2F 1
 %define HAVE_EXPF 1
-%define HAVE_FMINF 1
 %define HAVE_ISINF 1
 %define HAVE_ISNAN 1
 %define HAVE_LDEXPF 1
@ -232,6 +241,7 @@
 %define HAVE_GETTIMEOFDAY 0
 %define HAVE_GLOB 0
 %define HAVE_GLXGETPROCADDRESS 0
+%define HAVE_GMTIME_R 0
 %define HAVE_INET_ATON 0
 %define HAVE_ISATTY 1
 %define HAVE_JACK_PORT_GET_LATENCY_RANGE 0
@ -240,6 +250,7 @@
 %define HAVE_LZO1X_999_COMPRESS 0
 %define HAVE_MACH_ABSOLUTE_TIME 0
 %define HAVE_MAPVIEWOFFILE 1
+%define HAVE_MOVEFILEEXA 1
 %define HAVE_MEMALIGN 0
 %define HAVE_MKSTEMP 0
 %define HAVE_MMAP 0
@ -263,13 +274,13 @@
 %define HAVE_OS2THREADS 0
 %define HAVE_W32THREADS 1
 %define HAVE_AS_DN_DIRECTIVE 0
-%define HAVE_AS_FUNC 1
+%define HAVE_AS_FUNC 0
 %define HAVE_ASM_MOD_Q 0
 %define HAVE_ATTRIBUTE_MAY_ALIAS 0
 %define HAVE_ATTRIBUTE_PACKED 0
 %define HAVE_EBP_AVAILABLE 0
 %define HAVE_EBX_AVAILABLE 0
-%define HAVE_GNU_AS 1
+%define HAVE_GNU_AS 0
 %define HAVE_GNU_WINDRES 0
 %define HAVE_IBM_ASM 0
 %define HAVE_INLINE_ASM_LABELS 0
@ -282,6 +293,7 @@
 %define HAVE_VFP_ARGS 0
 %define HAVE_XFORM_ASM 0
 %define HAVE_XMM_CLOBBERS 0
+%define HAVE_CONDITION_VARIABLE_PTR 1
 %define HAVE_SOCKLEN_T 0
 %define HAVE_STRUCT_ADDRINFO 0
 %define HAVE_STRUCT_GROUP_SOURCE_REQ 0
@ -303,6 +315,7 @@
 %define HAVE_LIBDC1394_1 0
 %define HAVE_LIBDC1394_2 0
 %define HAVE_MAKEINFO 1
+%define HAVE_MAKEINFO_HTML 0
 %define HAVE_PERL 1
 %define HAVE_POD2MAN 0
 %define HAVE_SDL 0
@ -329,6 +342,7 @@
 %define CONFIG_AVIO_READING_EXAMPLE 1
 %define CONFIG_DECODING_ENCODING_EXAMPLE 1
 %define CONFIG_DEMUXING_DECODING_EXAMPLE 1
+%define CONFIG_EXTRACT_MVS_EXAMPLE 1
 %define CONFIG_FILTER_AUDIO_EXAMPLE 0
 %define CONFIG_FILTERING_AUDIO_EXAMPLE 0
 %define CONFIG_FILTERING_VIDEO_EXAMPLE 0
@ -360,6 +374,7 @@
 %define CONFIG_LIBFLITE 0
 %define CONFIG_LIBFONTCONFIG 0
 %define CONFIG_LIBFREETYPE 0
+%define CONFIG_LIBFRIBIDI 0
 %define CONFIG_LIBGME 0
 %define CONFIG_LIBGSM 0
 %define CONFIG_LIBIEC61883 0
@ -377,6 +392,7 @@
 %define CONFIG_LIBRTMP 0
 %define CONFIG_LIBSCHROEDINGER 0
 %define CONFIG_LIBSHINE 0
+%define CONFIG_LIBSMBCLIENT 0
 %define CONFIG_LIBSOXR 0
 %define CONFIG_LIBSPEEX 0
 %define CONFIG_LIBSSH 0
@ -395,13 +411,19 @@
 %define CONFIG_LIBX264 0
 %define CONFIG_LIBX265 0
 %define CONFIG_LIBXAVS 0
+%define CONFIG_LIBXCB 0
+%define CONFIG_LIBXCB_SHM 0
+%define CONFIG_LIBXCB_SHAPE 0
+%define CONFIG_LIBXCB_XFIXES 0
 %define CONFIG_LIBXVID 0
 %define CONFIG_LIBZMQ 0
 %define CONFIG_LIBZVBI 0
+%define CONFIG_LZMA 0
 %define CONFIG_OPENAL 0
 %define CONFIG_OPENCL 0
 %define CONFIG_OPENGL 0
 %define CONFIG_OPENSSL 0
+%define CONFIG_SDL 0
 %define CONFIG_X11GRAB 0
 %define CONFIG_XLIB 0
 %define CONFIG_ZLIB 1
@ -412,7 +434,6 @@
 %define CONFIG_SAFE_BITSTREAM_READER 1
 %define CONFIG_SHARED 0
 %define CONFIG_SMALL 0
-%define CONFIG_SRAM 0
 %define CONFIG_STATIC 1
 %define CONFIG_SWSCALE_ALPHA 1
 %define CONFIG_DXVA2 1
@ -439,11 +460,13 @@
 %define CONFIG_DCT 1
 %define CONFIG_DWT 1
 %define CONFIG_ERROR_RESILIENCE 1
+%define CONFIG_FAAN 1
 %define CONFIG_FAST_UNALIGNED 1
 %define CONFIG_FFT 1
 %define CONFIG_LSP 1
 %define CONFIG_LZO 1
 %define CONFIG_MDCT 1
+%define CONFIG_PIXELUTILS 0
 %define CONFIG_NETWORK 0
 %define CONFIG_RDFT 1
 %define CONFIG_FONTCONFIG 0
@ -459,9 +482,15 @@
 %define CONFIG_AANDCTTABLES 1
 %define CONFIG_AC3DSP 1
 %define CONFIG_AUDIO_FRAME_QUEUE 0
+%define CONFIG_AUDIODSP 1
+%define CONFIG_BLOCKDSP 1
+%define CONFIG_BSWAPDSP 1
 %define CONFIG_CABAC 1
-%define CONFIG_DSPUTIL 1
+%define CONFIG_DVPROFILE 1
 %define CONFIG_EXIF 1
+%define CONFIG_FAANDCT 1
+%define CONFIG_FAANIDCT 1
+%define CONFIG_FDCTDSP 1
 %define CONFIG_FRAME_THREAD_ENCODER 0
 %define CONFIG_GCRYPT 0
 %define CONFIG_GOLOMB 1
@ -475,16 +504,21 @@
 %define CONFIG_HUFFMAN 1
 %define CONFIG_HUFFYUVDSP 1
 %define CONFIG_HUFFYUVENCDSP 0
+%define CONFIG_IDCTDSP 1
+%define CONFIG_IIRFILTER 0
 %define CONFIG_INTRAX8 1
 %define CONFIG_LGPLV3 0
 %define CONFIG_LLAUDDSP 1
 %define CONFIG_LLVIDDSP 1
 %define CONFIG_LPC 0
+%define CONFIG_ME_CMP 1
+%define CONFIG_MPEG_ER 1
 %define CONFIG_MPEGAUDIO 1
 %define CONFIG_MPEGAUDIODSP 1
 %define CONFIG_MPEGVIDEO 1
-%define CONFIG_MPEGVIDEOENC 0
+%define CONFIG_MPEGVIDEOENC 1
 %define CONFIG_NETTLE 0
+%define CONFIG_PIXBLOCKDSP 1
 %define CONFIG_QPELDSP 1
 %define CONFIG_RANGECODER 1
 %define CONFIG_RIFFDEC 1
@ -492,9 +526,11 @@
 %define CONFIG_RTPDEC 0
 %define CONFIG_RTPENC_CHAIN 0
 %define CONFIG_SINEWIN 1
+%define CONFIG_STARTCODE 1
 %define CONFIG_TPELDSP 1
 %define CONFIG_VIDEODSP 1
 %define CONFIG_VP3DSP 1
+%define CONFIG_WMA_FREQS 1
 %define CONFIG_AAC_ADTSTOASC_BSF 1
 %define CONFIG_CHOMP_BSF 1
 %define CONFIG_DUMP_EXTRADATA_BSF 1
@ -513,6 +549,7 @@
 %define CONFIG_AMV_DECODER 1
 %define CONFIG_ANM_DECODER 1
 %define CONFIG_ANSI_DECODER 1
+%define CONFIG_APNG_DECODER 1
 %define CONFIG_ASV1_DECODER 1
 %define CONFIG_ASV2_DECODER 1
 %define CONFIG_AURA_DECODER 1
@ -881,6 +918,7 @@
 %define CONFIG_REALTEXT_DECODER 1
 %define CONFIG_SAMI_DECODER 1
 %define CONFIG_SRT_DECODER 1
+%define CONFIG_STL_DECODER 1
 %define CONFIG_SUBRIP_DECODER 1
 %define CONFIG_SUBVIEWER_DECODER 1
 %define CONFIG_SUBVIEWER1_DECODER 1
@ -921,6 +959,7 @@
 %define CONFIG_ANM_DEMUXER 1
 %define CONFIG_APC_DEMUXER 1
 %define CONFIG_APE_DEMUXER 1
+%define CONFIG_APNG_DEMUXER 1
 %define CONFIG_AQTITLE_DEMUXER 1
 %define CONFIG_ASF_DEMUXER 1
 %define CONFIG_ASS_DEMUXER 1
@ -966,6 +1005,7 @@
 %define CONFIG_FLAC_DEMUXER 1
 %define CONFIG_FLIC_DEMUXER 1
 %define CONFIG_FLV_DEMUXER 1
+%define CONFIG_LIVE_FLV_DEMUXER 1
 %define CONFIG_FOURXM_DEMUXER 1
 %define CONFIG_FRM_DEMUXER 1
 %define CONFIG_G722_DEMUXER 1
@ -1000,6 +1040,7 @@
 %define CONFIG_LATM_DEMUXER 1
 %define CONFIG_LMLM4_DEMUXER 1
 %define CONFIG_LOAS_DEMUXER 1
+%define CONFIG_LRC_DEMUXER 1
 %define CONFIG_LVF_DEMUXER 1
 %define CONFIG_LXF_DEMUXER 1
 %define CONFIG_M4V_DEMUXER 1
@ -1089,8 +1130,10 @@
 %define CONFIG_SPDIF_DEMUXER 1
 %define CONFIG_SRT_DEMUXER 1
 %define CONFIG_STR_DEMUXER 1
+%define CONFIG_STL_DEMUXER 1
 %define CONFIG_SUBVIEWER1_DEMUXER 1
 %define CONFIG_SUBVIEWER_DEMUXER 1
+%define CONFIG_SUP_DEMUXER 1
 %define CONFIG_SWF_DEMUXER 1
 %define CONFIG_TAK_DEMUXER 1
 %define CONFIG_TEDCAPTIONS_DEMUXER 1
@ -1112,6 +1155,7 @@
 %define CONFIG_W64_DEMUXER 1
 %define CONFIG_WAV_DEMUXER 1
 %define CONFIG_WC3_DEMUXER 1
+%define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 1
 %define CONFIG_WEBVTT_DEMUXER 1
 %define CONFIG_WSAUD_DEMUXER 1
 %define CONFIG_WSVQA_DEMUXER 1
@ -1123,6 +1167,18 @@
 %define CONFIG_XWMA_DEMUXER 1
 %define CONFIG_YOP_DEMUXER 1
 %define CONFIG_YUV4MPEGPIPE_DEMUXER 1
+%define CONFIG_IMAGE_BMP_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_DPX_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_EXR_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_J2K_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_PNG_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_SGI_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_WEBP_PIPE_DEMUXER 1
 %define CONFIG_LIBGME_DEMUXER 0
 %define CONFIG_LIBMODPLUG_DEMUXER 0
 %define CONFIG_LIBNUT_DEMUXER 0
@ -1292,7 +1348,6 @@
 %define CONFIG_LIBXAVS_ENCODER 0
 %define CONFIG_LIBXVID_ENCODER 0
 %define CONFIG_LIBAACPLUS_ENCODER 0
-%define CONFIG_ACONVERT_FILTER 0
 %define CONFIG_ADELAY_FILTER 0
 %define CONFIG_AECHO_FILTER 0
 %define CONFIG_AEVAL_FILTER 0
@ -1332,6 +1387,7 @@
 %define CONFIG_EARWAX_FILTER 0
 %define CONFIG_EBUR128_FILTER 0
 %define CONFIG_EQUALIZER_FILTER 0
+%define CONFIG_FLANGER_FILTER 0
 %define CONFIG_HIGHPASS_FILTER 0
 %define CONFIG_JOIN_FILTER 0
 %define CONFIG_LADSPA_FILTER 0
@ -1340,6 +1396,7 @@
 %define CONFIG_REPLAYGAIN_FILTER 0
 %define CONFIG_RESAMPLE_FILTER 0
 %define CONFIG_SILENCEDETECT_FILTER 0
+%define CONFIG_SILENCEREMOVE_FILTER 0
 %define CONFIG_TREBLE_FILTER 0
 %define CONFIG_VOLUME_FILTER 0
 %define CONFIG_VOLUMEDETECT_FILTER 0
@ -1356,6 +1413,7 @@
 %define CONFIG_BLACKFRAME_FILTER 0
 %define CONFIG_BLEND_FILTER 0
 %define CONFIG_BOXBLUR_FILTER 0
+%define CONFIG_CODECVIEW_FILTER 0
 %define CONFIG_COLORBALANCE_FILTER 0
 %define CONFIG_COLORCHANNELMIXER_FILTER 0
 %define CONFIG_COLORMATRIX_FILTER 0
@ -1390,12 +1448,14 @@
 %define CONFIG_HISTEQ_FILTER 0
 %define CONFIG_HISTOGRAM_FILTER 0
 %define CONFIG_HQDN3D_FILTER 0
+%define CONFIG_HQX_FILTER 0
 %define CONFIG_HUE_FILTER 0
 %define CONFIG_IDET_FILTER 0
 %define CONFIG_IL_FILTER 0
 %define CONFIG_INTERLACE_FILTER 0
 %define CONFIG_INTERLEAVE_FILTER 0
 %define CONFIG_KERNDEINT_FILTER 0
+%define CONFIG_LENSCORRECTION_FILTER 0
 %define CONFIG_LUT3D_FILTER 0
 %define CONFIG_LUT_FILTER 0
 %define CONFIG_LUTRGB_FILTER 0
@ -1433,6 +1493,7 @@
 %define CONFIG_SETTB_FILTER 0
 %define CONFIG_SHOWINFO_FILTER 0
 %define CONFIG_SHUFFLEPLANES_FILTER 0
+%define CONFIG_SIGNALSTATS_FILTER 0
 %define CONFIG_SMARTBLUR_FILTER 0
 %define CONFIG_SPLIT_FILTER 0
 %define CONFIG_SPP_FILTER 0
@ -1452,8 +1513,10 @@
 %define CONFIG_VIDSTABTRANSFORM_FILTER 0
 %define CONFIG_VIGNETTE_FILTER 0
 %define CONFIG_W3FDIF_FILTER 0
+%define CONFIG_XBR_FILTER 0
 %define CONFIG_YADIF_FILTER 0
 %define CONFIG_ZMQ_FILTER 0
+%define CONFIG_ZOOMPAN_FILTER 0
 %define CONFIG_CELLAUTO_FILTER 0
 %define CONFIG_COLOR_FILTER 0
 %define CONFIG_FREI0R_SRC_FILTER 0
@ -1498,6 +1561,7 @@
 %define CONFIG_ALSA_INDEV 0
 %define CONFIG_AVFOUNDATION_INDEV 0
 %define CONFIG_BKTR_INDEV 0
+%define CONFIG_DECKLINK_INDEV 0
 %define CONFIG_DSHOW_INDEV 0
 %define CONFIG_DV1394_INDEV 0
 %define CONFIG_FBDEV_INDEV 0
@ -1513,6 +1577,7 @@
 %define CONFIG_V4L2_INDEV 0
 %define CONFIG_VFWCAP_INDEV 0
 %define CONFIG_X11GRAB_INDEV 0
+%define CONFIG_X11GRAB_XCB_INDEV 0
 %define CONFIG_LIBCDIO_INDEV 0
 %define CONFIG_LIBDC1394_INDEV 0
 %define CONFIG_A64_MUXER 0
@ -1532,6 +1597,7 @@
 %define CONFIG_CAF_MUXER 0
 %define CONFIG_CAVSVIDEO_MUXER 0
 %define CONFIG_CRC_MUXER 0
+%define CONFIG_DASH_MUXER 0
 %define CONFIG_DATA_MUXER 0
 %define CONFIG_DAUD_MUXER 0
 %define CONFIG_DIRAC_MUXER 0
@ -1567,6 +1633,7 @@
 %define CONFIG_IVF_MUXER 0
 %define CONFIG_JACOSUB_MUXER 0
 %define CONFIG_LATM_MUXER 0
+%define CONFIG_LRC_MUXER 0
 %define CONFIG_M4V_MUXER 0
 %define CONFIG_MD5_MUXER 0
 %define CONFIG_MATROSKA_MUXER 0
@ -1629,8 +1696,8 @@
 %define CONFIG_SMJPEG_MUXER 0
 %define CONFIG_SMOOTHSTREAMING_MUXER 0
 %define CONFIG_SOX_MUXER 0
+%define CONFIG_SPX_MUXER 0
 %define CONFIG_SPDIF_MUXER 0
-%define CONFIG_SPEEX_MUXER 0
 %define CONFIG_SRT_MUXER 0
 %define CONFIG_SWF_MUXER 0
 %define CONFIG_TEE_MUXER 0
@ -1645,6 +1712,8 @@
 %define CONFIG_W64_MUXER 0
 %define CONFIG_WAV_MUXER 0
 %define CONFIG_WEBM_MUXER 0
+%define CONFIG_WEBM_DASH_MANIFEST_MUXER 0
+%define CONFIG_WEBP_MUXER 0
 %define CONFIG_WEBVTT_MUXER 0
 %define CONFIG_WTV_MUXER 0
 %define CONFIG_WV_MUXER 0
@ -1711,6 +1780,7 @@
 %define CONFIG_HTTP_PROTOCOL 0
 %define CONFIG_HTTPPROXY_PROTOCOL 0
 %define CONFIG_HTTPS_PROTOCOL 0
+%define CONFIG_ICECAST_PROTOCOL 0
 %define CONFIG_MMSH_PROTOCOL 0
 %define CONFIG_MMST_PROTOCOL 0
 %define CONFIG_MD5_PROTOCOL 1
@ -1728,6 +1798,7 @@
 %define CONFIG_TCP_PROTOCOL 0
 %define CONFIG_TLS_PROTOCOL 0
 %define CONFIG_UDP_PROTOCOL 0
+%define CONFIG_UDPLITE_PROTOCOL 0
 %define CONFIG_UNIX_PROTOCOL 0
 %define CONFIG_LIBRTMP_PROTOCOL 0
 %define CONFIG_LIBRTMPE_PROTOCOL 0
@ -1735,3 +1806,4 @@
 %define CONFIG_LIBRTMPT_PROTOCOL 0
 %define CONFIG_LIBRTMPTE_PROTOCOL 0
 %define CONFIG_LIBSSH_PROTOCOL 0
+%define CONFIG_LIBSMBCLIENT_PROTOCOL 0
--- a/build/ffmpeg/config-x64.h
+++ b/build/ffmpeg/config-x64.h
@ -6,13 +6,14 @@
 #define CONFIG_THIS_YEAR 2014
 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
 #define AVCONV_DATADIR "/usr/local/share/ffmpeg"
-#define CC_IDENT "Microsoft (R) C/C++ Optimizing Compiler Version 18.00.30324 for x64"
+#define CC_IDENT "Microsoft (R) C/C++ Optimizing Compiler Version 18.00.31101 for x64"
 #define av_restrict __restrict
 #define EXTERN_PREFIX ""
 #define EXTERN_ASM 
 #define BUILDSUF ""
 #define SLIBSUF ".dll"
 #define HAVE_MMX2 HAVE_MMXEXT
+#define SWS_MAX_FILTER_SIZE 256
 #define ARCH_AARCH64 0
 #define ARCH_ALPHA 0
 #define ARCH_ARM 0
@ -44,10 +45,12 @@
 #define HAVE_NEON 0
 #define HAVE_VFP 0
 #define HAVE_VFPV3 0
+#define HAVE_SETEND 0
 #define HAVE_ALTIVEC 0
 #define HAVE_DCBZL 1
 #define HAVE_LDBRX 1
 #define HAVE_PPC4XX 0
+#define HAVE_VSX 0
 #define HAVE_AMD3DNOW 1
 #define HAVE_AMD3DNOWEXT 1
 #define HAVE_AVX 1
@ -77,10 +80,12 @@
 #define HAVE_NEON_EXTERNAL 0
 #define HAVE_VFP_EXTERNAL 0
 #define HAVE_VFPV3_EXTERNAL 0
+#define HAVE_SETEND_EXTERNAL 0
 #define HAVE_ALTIVEC_EXTERNAL 0
 #define HAVE_DCBZL_EXTERNAL 0
 #define HAVE_LDBRX_EXTERNAL 0
 #define HAVE_PPC4XX_EXTERNAL 0
+#define HAVE_VSX_EXTERNAL 0
 #define HAVE_AMD3DNOW_EXTERNAL 1
 #define HAVE_AMD3DNOWEXT_EXTERNAL 1
 #define HAVE_AVX_EXTERNAL 1
@ -110,10 +115,12 @@
 #define HAVE_NEON_INLINE 0
 #define HAVE_VFP_INLINE 0
 #define HAVE_VFPV3_INLINE 0
+#define HAVE_SETEND_INLINE 0
 #define HAVE_ALTIVEC_INLINE 0
 #define HAVE_DCBZL_INLINE 0
 #define HAVE_LDBRX_INLINE 0
 #define HAVE_PPC4XX_INLINE 0
+#define HAVE_VSX_INLINE 0
 #define HAVE_AMD3DNOW_INLINE 0
 #define HAVE_AMD3DNOWEXT_INLINE 0
 #define HAVE_AVX_INLINE 0
@ -143,10 +150,12 @@
 #define HAVE_LOCAL_ALIGNED_8 1
 #define HAVE_LOCAL_ALIGNED_16 1
 #define HAVE_LOCAL_ALIGNED_32 1
+#define HAVE_SIMD_ALIGN_16 1
 #define HAVE_ATOMICS_GCC 0
 #define HAVE_ATOMICS_SUNCC 0
 #define HAVE_ATOMICS_WIN32 1
 #define HAVE_ATOMIC_CAS_PTR 0
+#define HAVE_ATOMIC_COMPARE_EXCHANGE 0
 #define HAVE_MACHINE_RW_BARRIER 0
 #define HAVE_MEMORYBARRIER 1
 #define HAVE_MM_EMPTY 0
@ -195,9 +204,11 @@
 #define HAVE_SYS_UN_H 0
 #define HAVE_SYS_VIDEOIO_H 0
 #define HAVE_TERMIOS_H 0
+#define HAVE_UDPLITE_H 0
 #define HAVE_UNISTD_H 0
 #define HAVE_WINDOWS_H 1
 #define HAVE_WINSOCK2_H 0
+#define HAVE_INTRINSICS_NEON 0
 #define HAVE_ATANF 1
 #define HAVE_ATAN2F 1
 #define HAVE_CBRT 1
@ -206,7 +217,6 @@
 #define HAVE_EXP2 1
 #define HAVE_EXP2F 1
 #define HAVE_EXPF 1
-#define HAVE_FMINF 1
 #define HAVE_ISINF 1
 #define HAVE_ISNAN 1
 #define HAVE_LDEXPF 1
@ -247,6 +257,7 @@
 #define HAVE_GETTIMEOFDAY 0
 #define HAVE_GLOB 0
 #define HAVE_GLXGETPROCADDRESS 0
+#define HAVE_GMTIME_R 0
 #define HAVE_INET_ATON 0
 #define HAVE_ISATTY 1
 #define HAVE_JACK_PORT_GET_LATENCY_RANGE 0
@ -255,6 +266,7 @@
 #define HAVE_LZO1X_999_COMPRESS 0
 #define HAVE_MACH_ABSOLUTE_TIME 0
 #define HAVE_MAPVIEWOFFILE 1
+#define HAVE_MOVEFILEEXA 1
 #define HAVE_MEMALIGN 0
 #define HAVE_MKSTEMP 0
 #define HAVE_MMAP 0
@ -278,13 +290,13 @@
 #define HAVE_OS2THREADS 0
 #define HAVE_W32THREADS 1
 #define HAVE_AS_DN_DIRECTIVE 0
-#define HAVE_AS_FUNC 1
+#define HAVE_AS_FUNC 0
 #define HAVE_ASM_MOD_Q 0
 #define HAVE_ATTRIBUTE_MAY_ALIAS 0
 #define HAVE_ATTRIBUTE_PACKED 0
 #define HAVE_EBP_AVAILABLE 0
 #define HAVE_EBX_AVAILABLE 0
-#define HAVE_GNU_AS 1
+#define HAVE_GNU_AS 0
 #define HAVE_GNU_WINDRES 0
 #define HAVE_IBM_ASM 0
 #define HAVE_INLINE_ASM_LABELS 0
@ -297,6 +309,7 @@
 #define HAVE_VFP_ARGS 0
 #define HAVE_XFORM_ASM 0
 #define HAVE_XMM_CLOBBERS 0
+#define HAVE_CONDITION_VARIABLE_PTR 1
 #define HAVE_SOCKLEN_T 0
 #define HAVE_STRUCT_ADDRINFO 0
 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0
@ -318,6 +331,7 @@
 #define HAVE_LIBDC1394_1 0
 #define HAVE_LIBDC1394_2 0
 #define HAVE_MAKEINFO 1
+#define HAVE_MAKEINFO_HTML 0
 #define HAVE_PERL 1
 #define HAVE_POD2MAN 0
 #define HAVE_SDL 0
@ -344,6 +358,7 @@
 #define CONFIG_AVIO_READING_EXAMPLE 1
 #define CONFIG_DECODING_ENCODING_EXAMPLE 1
 #define CONFIG_DEMUXING_DECODING_EXAMPLE 1
+#define CONFIG_EXTRACT_MVS_EXAMPLE 1
 #define CONFIG_FILTER_AUDIO_EXAMPLE 0
 #define CONFIG_FILTERING_AUDIO_EXAMPLE 0
 #define CONFIG_FILTERING_VIDEO_EXAMPLE 0
@ -375,6 +390,7 @@
 #define CONFIG_LIBFLITE 0
 #define CONFIG_LIBFONTCONFIG 0
 #define CONFIG_LIBFREETYPE 0
+#define CONFIG_LIBFRIBIDI 0
 #define CONFIG_LIBGME 0
 #define CONFIG_LIBGSM 0
 #define CONFIG_LIBIEC61883 0
@ -392,6 +408,7 @@
 #define CONFIG_LIBRTMP 0
 #define CONFIG_LIBSCHROEDINGER 0
 #define CONFIG_LIBSHINE 0
+#define CONFIG_LIBSMBCLIENT 0
 #define CONFIG_LIBSOXR 0
 #define CONFIG_LIBSPEEX 0
 #define CONFIG_LIBSSH 0
@ -410,13 +427,19 @@
 #define CONFIG_LIBX264 0
 #define CONFIG_LIBX265 0
 #define CONFIG_LIBXAVS 0
+#define CONFIG_LIBXCB 0
+#define CONFIG_LIBXCB_SHM 0
+#define CONFIG_LIBXCB_SHAPE 0
+#define CONFIG_LIBXCB_XFIXES 0
 #define CONFIG_LIBXVID 0
 #define CONFIG_LIBZMQ 0
 #define CONFIG_LIBZVBI 0
+#define CONFIG_LZMA 0
 #define CONFIG_OPENAL 0
 #define CONFIG_OPENCL 0
 #define CONFIG_OPENGL 0
 #define CONFIG_OPENSSL 0
+#define CONFIG_SDL 0
 #define CONFIG_X11GRAB 0
 #define CONFIG_XLIB 0
 #define CONFIG_ZLIB 1
@ -427,7 +450,6 @@
 #define CONFIG_SAFE_BITSTREAM_READER 1
 #define CONFIG_SHARED 0
 #define CONFIG_SMALL 0
-#define CONFIG_SRAM 0
 #define CONFIG_STATIC 1
 #define CONFIG_SWSCALE_ALPHA 1
 #define CONFIG_DXVA2 1
@ -454,11 +476,13 @@
 #define CONFIG_DCT 1
 #define CONFIG_DWT 1
 #define CONFIG_ERROR_RESILIENCE 1
+#define CONFIG_FAAN 1
 #define CONFIG_FAST_UNALIGNED 1
 #define CONFIG_FFT 1
 #define CONFIG_LSP 1
 #define CONFIG_LZO 1
 #define CONFIG_MDCT 1
+#define CONFIG_PIXELUTILS 0
 #define CONFIG_NETWORK 0
 #define CONFIG_RDFT 1
 #define CONFIG_FONTCONFIG 0
@ -474,9 +498,15 @@
 #define CONFIG_AANDCTTABLES 1
 #define CONFIG_AC3DSP 1
 #define CONFIG_AUDIO_FRAME_QUEUE 0
+#define CONFIG_AUDIODSP 1
+#define CONFIG_BLOCKDSP 1
+#define CONFIG_BSWAPDSP 1
 #define CONFIG_CABAC 1
-#define CONFIG_DSPUTIL 1
+#define CONFIG_DVPROFILE 1
 #define CONFIG_EXIF 1
+#define CONFIG_FAANDCT 1
+#define CONFIG_FAANIDCT 1
+#define CONFIG_FDCTDSP 1
 #define CONFIG_FRAME_THREAD_ENCODER 0
 #define CONFIG_GCRYPT 0
 #define CONFIG_GOLOMB 1
@ -490,16 +520,21 @@
 #define CONFIG_HUFFMAN 1
 #define CONFIG_HUFFYUVDSP 1
 #define CONFIG_HUFFYUVENCDSP 0
+#define CONFIG_IDCTDSP 1
+#define CONFIG_IIRFILTER 0
 #define CONFIG_INTRAX8 1
 #define CONFIG_LGPLV3 0
 #define CONFIG_LLAUDDSP 1
 #define CONFIG_LLVIDDSP 1
 #define CONFIG_LPC 0
+#define CONFIG_ME_CMP 1
+#define CONFIG_MPEG_ER 1
 #define CONFIG_MPEGAUDIO 1
 #define CONFIG_MPEGAUDIODSP 1
 #define CONFIG_MPEGVIDEO 1
-#define CONFIG_MPEGVIDEOENC 0
+#define CONFIG_MPEGVIDEOENC 1
 #define CONFIG_NETTLE 0
+#define CONFIG_PIXBLOCKDSP 1
 #define CONFIG_QPELDSP 1
 #define CONFIG_RANGECODER 1
 #define CONFIG_RIFFDEC 1
@ -507,9 +542,11 @@
 #define CONFIG_RTPDEC 0
 #define CONFIG_RTPENC_CHAIN 0
 #define CONFIG_SINEWIN 1
+#define CONFIG_STARTCODE 1
 #define CONFIG_TPELDSP 1
 #define CONFIG_VIDEODSP 1
 #define CONFIG_VP3DSP 1
+#define CONFIG_WMA_FREQS 1
 #define CONFIG_AAC_ADTSTOASC_BSF 1
 #define CONFIG_CHOMP_BSF 1
 #define CONFIG_DUMP_EXTRADATA_BSF 1
@ -528,6 +565,7 @@
 #define CONFIG_AMV_DECODER 1
 #define CONFIG_ANM_DECODER 1
 #define CONFIG_ANSI_DECODER 1
+#define CONFIG_APNG_DECODER 1
 #define CONFIG_ASV1_DECODER 1
 #define CONFIG_ASV2_DECODER 1
 #define CONFIG_AURA_DECODER 1
@ -896,6 +934,7 @@
 #define CONFIG_REALTEXT_DECODER 1
 #define CONFIG_SAMI_DECODER 1
 #define CONFIG_SRT_DECODER 1
+#define CONFIG_STL_DECODER 1
 #define CONFIG_SUBRIP_DECODER 1
 #define CONFIG_SUBVIEWER_DECODER 1
 #define CONFIG_SUBVIEWER1_DECODER 1
@ -936,6 +975,7 @@
 #define CONFIG_ANM_DEMUXER 1
 #define CONFIG_APC_DEMUXER 1
 #define CONFIG_APE_DEMUXER 1
+#define CONFIG_APNG_DEMUXER 1
 #define CONFIG_AQTITLE_DEMUXER 1
 #define CONFIG_ASF_DEMUXER 1
 #define CONFIG_ASS_DEMUXER 1
@ -981,6 +1021,7 @@
 #define CONFIG_FLAC_DEMUXER 1
 #define CONFIG_FLIC_DEMUXER 1
 #define CONFIG_FLV_DEMUXER 1
+#define CONFIG_LIVE_FLV_DEMUXER 1
 #define CONFIG_FOURXM_DEMUXER 1
 #define CONFIG_FRM_DEMUXER 1
 #define CONFIG_G722_DEMUXER 1
@ -1015,6 +1056,7 @@
 #define CONFIG_LATM_DEMUXER 1
 #define CONFIG_LMLM4_DEMUXER 1
 #define CONFIG_LOAS_DEMUXER 1
+#define CONFIG_LRC_DEMUXER 1
 #define CONFIG_LVF_DEMUXER 1
 #define CONFIG_LXF_DEMUXER 1
 #define CONFIG_M4V_DEMUXER 1
@ -1104,8 +1146,10 @@
 #define CONFIG_SPDIF_DEMUXER 1
 #define CONFIG_SRT_DEMUXER 1
 #define CONFIG_STR_DEMUXER 1
+#define CONFIG_STL_DEMUXER 1
 #define CONFIG_SUBVIEWER1_DEMUXER 1
 #define CONFIG_SUBVIEWER_DEMUXER 1
+#define CONFIG_SUP_DEMUXER 1
 #define CONFIG_SWF_DEMUXER 1
 #define CONFIG_TAK_DEMUXER 1
 #define CONFIG_TEDCAPTIONS_DEMUXER 1
@ -1127,6 +1171,7 @@
 #define CONFIG_W64_DEMUXER 1
 #define CONFIG_WAV_DEMUXER 1
 #define CONFIG_WC3_DEMUXER 1
+#define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 1
 #define CONFIG_WEBVTT_DEMUXER 1
 #define CONFIG_WSAUD_DEMUXER 1
 #define CONFIG_WSVQA_DEMUXER 1
@ -1138,6 +1183,18 @@
 #define CONFIG_XWMA_DEMUXER 1
 #define CONFIG_YOP_DEMUXER 1
 #define CONFIG_YUV4MPEGPIPE_DEMUXER 1
+#define CONFIG_IMAGE_BMP_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_DPX_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_EXR_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_J2K_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_PNG_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_SGI_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_WEBP_PIPE_DEMUXER 1
 #define CONFIG_LIBGME_DEMUXER 0
 #define CONFIG_LIBMODPLUG_DEMUXER 0
 #define CONFIG_LIBNUT_DEMUXER 0
@ -1307,7 +1364,6 @@
 #define CONFIG_LIBXAVS_ENCODER 0
 #define CONFIG_LIBXVID_ENCODER 0
 #define CONFIG_LIBAACPLUS_ENCODER 0
-#define CONFIG_ACONVERT_FILTER 0
 #define CONFIG_ADELAY_FILTER 0
 #define CONFIG_AECHO_FILTER 0
 #define CONFIG_AEVAL_FILTER 0
@ -1347,6 +1403,7 @@
 #define CONFIG_EARWAX_FILTER 0
 #define CONFIG_EBUR128_FILTER 0
 #define CONFIG_EQUALIZER_FILTER 0
+#define CONFIG_FLANGER_FILTER 0
 #define CONFIG_HIGHPASS_FILTER 0
 #define CONFIG_JOIN_FILTER 0
 #define CONFIG_LADSPA_FILTER 0
@ -1355,6 +1412,7 @@
 #define CONFIG_REPLAYGAIN_FILTER 0
 #define CONFIG_RESAMPLE_FILTER 0
 #define CONFIG_SILENCEDETECT_FILTER 0
+#define CONFIG_SILENCEREMOVE_FILTER 0
 #define CONFIG_TREBLE_FILTER 0
 #define CONFIG_VOLUME_FILTER 0
 #define CONFIG_VOLUMEDETECT_FILTER 0
@ -1371,6 +1429,7 @@
 #define CONFIG_BLACKFRAME_FILTER 0
 #define CONFIG_BLEND_FILTER 0
 #define CONFIG_BOXBLUR_FILTER 0
+#define CONFIG_CODECVIEW_FILTER 0
 #define CONFIG_COLORBALANCE_FILTER 0
 #define CONFIG_COLORCHANNELMIXER_FILTER 0
 #define CONFIG_COLORMATRIX_FILTER 0
@ -1405,12 +1464,14 @@
 #define CONFIG_HISTEQ_FILTER 0
 #define CONFIG_HISTOGRAM_FILTER 0
 #define CONFIG_HQDN3D_FILTER 0
+#define CONFIG_HQX_FILTER 0
 #define CONFIG_HUE_FILTER 0
 #define CONFIG_IDET_FILTER 0
 #define CONFIG_IL_FILTER 0
 #define CONFIG_INTERLACE_FILTER 0
 #define CONFIG_INTERLEAVE_FILTER 0
 #define CONFIG_KERNDEINT_FILTER 0
+#define CONFIG_LENSCORRECTION_FILTER 0
 #define CONFIG_LUT3D_FILTER 0
 #define CONFIG_LUT_FILTER 0
 #define CONFIG_LUTRGB_FILTER 0
@ -1448,6 +1509,7 @@
 #define CONFIG_SETTB_FILTER 0
 #define CONFIG_SHOWINFO_FILTER 0
 #define CONFIG_SHUFFLEPLANES_FILTER 0
+#define CONFIG_SIGNALSTATS_FILTER 0
 #define CONFIG_SMARTBLUR_FILTER 0
 #define CONFIG_SPLIT_FILTER 0
 #define CONFIG_SPP_FILTER 0
@ -1467,8 +1529,10 @@
 #define CONFIG_VIDSTABTRANSFORM_FILTER 0
 #define CONFIG_VIGNETTE_FILTER 0
 #define CONFIG_W3FDIF_FILTER 0
+#define CONFIG_XBR_FILTER 0
 #define CONFIG_YADIF_FILTER 0
 #define CONFIG_ZMQ_FILTER 0
+#define CONFIG_ZOOMPAN_FILTER 0
 #define CONFIG_CELLAUTO_FILTER 0
 #define CONFIG_COLOR_FILTER 0
 #define CONFIG_FREI0R_SRC_FILTER 0
@ -1513,6 +1577,7 @@
 #define CONFIG_ALSA_INDEV 0
 #define CONFIG_AVFOUNDATION_INDEV 0
 #define CONFIG_BKTR_INDEV 0
+#define CONFIG_DECKLINK_INDEV 0
 #define CONFIG_DSHOW_INDEV 0
 #define CONFIG_DV1394_INDEV 0
 #define CONFIG_FBDEV_INDEV 0
@ -1528,6 +1593,7 @@
 #define CONFIG_V4L2_INDEV 0
 #define CONFIG_VFWCAP_INDEV 0
 #define CONFIG_X11GRAB_INDEV 0
+#define CONFIG_X11GRAB_XCB_INDEV 0
 #define CONFIG_LIBCDIO_INDEV 0
 #define CONFIG_LIBDC1394_INDEV 0
 #define CONFIG_A64_MUXER 0
@ -1547,6 +1613,7 @@
 #define CONFIG_CAF_MUXER 0
 #define CONFIG_CAVSVIDEO_MUXER 0
 #define CONFIG_CRC_MUXER 0
+#define CONFIG_DASH_MUXER 0
 #define CONFIG_DATA_MUXER 0
 #define CONFIG_DAUD_MUXER 0
 #define CONFIG_DIRAC_MUXER 0
@ -1582,6 +1649,7 @@
 #define CONFIG_IVF_MUXER 0
 #define CONFIG_JACOSUB_MUXER 0
 #define CONFIG_LATM_MUXER 0
+#define CONFIG_LRC_MUXER 0
 #define CONFIG_M4V_MUXER 0
 #define CONFIG_MD5_MUXER 0
 #define CONFIG_MATROSKA_MUXER 0
@ -1644,8 +1712,8 @@
 #define CONFIG_SMJPEG_MUXER 0
 #define CONFIG_SMOOTHSTREAMING_MUXER 0
 #define CONFIG_SOX_MUXER 0
+#define CONFIG_SPX_MUXER 0
 #define CONFIG_SPDIF_MUXER 0
-#define CONFIG_SPEEX_MUXER 0
 #define CONFIG_SRT_MUXER 0
 #define CONFIG_SWF_MUXER 0
 #define CONFIG_TEE_MUXER 0
@ -1660,6 +1728,8 @@
 #define CONFIG_W64_MUXER 0
 #define CONFIG_WAV_MUXER 0
 #define CONFIG_WEBM_MUXER 0
+#define CONFIG_WEBM_DASH_MANIFEST_MUXER 0
+#define CONFIG_WEBP_MUXER 0
 #define CONFIG_WEBVTT_MUXER 0
 #define CONFIG_WTV_MUXER 0
 #define CONFIG_WV_MUXER 0
@ -1726,6 +1796,7 @@
 #define CONFIG_HTTP_PROTOCOL 0
 #define CONFIG_HTTPPROXY_PROTOCOL 0
 #define CONFIG_HTTPS_PROTOCOL 0
+#define CONFIG_ICECAST_PROTOCOL 0
 #define CONFIG_MMSH_PROTOCOL 0
 #define CONFIG_MMST_PROTOCOL 0
 #define CONFIG_MD5_PROTOCOL 1
@ -1743,6 +1814,7 @@
 #define CONFIG_TCP_PROTOCOL 0
 #define CONFIG_TLS_PROTOCOL 0
 #define CONFIG_UDP_PROTOCOL 0
+#define CONFIG_UDPLITE_PROTOCOL 0
 #define CONFIG_UNIX_PROTOCOL 0
 #define CONFIG_LIBRTMP_PROTOCOL 0
 #define CONFIG_LIBRTMPE_PROTOCOL 0
@ -1750,4 +1822,5 @@
 #define CONFIG_LIBRTMPT_PROTOCOL 0
 #define CONFIG_LIBRTMPTE_PROTOCOL 0
 #define CONFIG_LIBSSH_PROTOCOL 0
+#define CONFIG_LIBSMBCLIENT_PROTOCOL 0
 #endif /* FFMPEG_CONFIG_H */
--- a/build/ffmpeg/config-x86.asm
+++ b/build/ffmpeg/config-x86.asm
@ -29,10 +29,12 @@
 %define HAVE_NEON 0
 %define HAVE_VFP 0
 %define HAVE_VFPV3 0
+%define HAVE_SETEND 0
 %define HAVE_ALTIVEC 0
 %define HAVE_DCBZL 1
 %define HAVE_LDBRX 1
 %define HAVE_PPC4XX 0
+%define HAVE_VSX 0
 %define HAVE_AMD3DNOW 1
 %define HAVE_AMD3DNOWEXT 1
 %define HAVE_AVX 1
@ -62,10 +64,12 @@
 %define HAVE_NEON_EXTERNAL 0
 %define HAVE_VFP_EXTERNAL 0
 %define HAVE_VFPV3_EXTERNAL 0
+%define HAVE_SETEND_EXTERNAL 0
 %define HAVE_ALTIVEC_EXTERNAL 0
 %define HAVE_DCBZL_EXTERNAL 0
 %define HAVE_LDBRX_EXTERNAL 0
 %define HAVE_PPC4XX_EXTERNAL 0
+%define HAVE_VSX_EXTERNAL 0
 %define HAVE_AMD3DNOW_EXTERNAL 1
 %define HAVE_AMD3DNOWEXT_EXTERNAL 1
 %define HAVE_AVX_EXTERNAL 1
@ -95,10 +99,12 @@
 %define HAVE_NEON_INLINE 0
 %define HAVE_VFP_INLINE 0
 %define HAVE_VFPV3_INLINE 0
+%define HAVE_SETEND_INLINE 0
 %define HAVE_ALTIVEC_INLINE 0
 %define HAVE_DCBZL_INLINE 0
 %define HAVE_LDBRX_INLINE 0
 %define HAVE_PPC4XX_INLINE 0
+%define HAVE_VSX_INLINE 0
 %define HAVE_AMD3DNOW_INLINE 0
 %define HAVE_AMD3DNOWEXT_INLINE 0
 %define HAVE_AVX_INLINE 0
@ -128,10 +134,12 @@
 %define HAVE_LOCAL_ALIGNED_8 1
 %define HAVE_LOCAL_ALIGNED_16 1
 %define HAVE_LOCAL_ALIGNED_32 1
+%define HAVE_SIMD_ALIGN_16 1
 %define HAVE_ATOMICS_GCC 0
 %define HAVE_ATOMICS_SUNCC 0
 %define HAVE_ATOMICS_WIN32 1
 %define HAVE_ATOMIC_CAS_PTR 0
+%define HAVE_ATOMIC_COMPARE_EXCHANGE 0
 %define HAVE_MACHINE_RW_BARRIER 0
 %define HAVE_MEMORYBARRIER 1
 %define HAVE_MM_EMPTY 1
@ -180,9 +188,11 @@
 %define HAVE_SYS_UN_H 0
 %define HAVE_SYS_VIDEOIO_H 0
 %define HAVE_TERMIOS_H 0
+%define HAVE_UDPLITE_H 0
 %define HAVE_UNISTD_H 0
 %define HAVE_WINDOWS_H 1
 %define HAVE_WINSOCK2_H 0
+%define HAVE_INTRINSICS_NEON 0
 %define HAVE_ATANF 1
 %define HAVE_ATAN2F 1
 %define HAVE_CBRT 1
@ -191,7 +201,6 @@
 %define HAVE_EXP2 1
 %define HAVE_EXP2F 1
 %define HAVE_EXPF 1
-%define HAVE_FMINF 1
 %define HAVE_ISINF 1
 %define HAVE_ISNAN 1
 %define HAVE_LDEXPF 1
@ -232,6 +241,7 @@
 %define HAVE_GETTIMEOFDAY 0
 %define HAVE_GLOB 0
 %define HAVE_GLXGETPROCADDRESS 0
+%define HAVE_GMTIME_R 0
 %define HAVE_INET_ATON 0
 %define HAVE_ISATTY 1
 %define HAVE_JACK_PORT_GET_LATENCY_RANGE 0
@ -240,6 +250,7 @@
 %define HAVE_LZO1X_999_COMPRESS 0
 %define HAVE_MACH_ABSOLUTE_TIME 0
 %define HAVE_MAPVIEWOFFILE 1
+%define HAVE_MOVEFILEEXA 1
 %define HAVE_MEMALIGN 0
 %define HAVE_MKSTEMP 0
 %define HAVE_MMAP 0
@ -263,13 +274,13 @@
 %define HAVE_OS2THREADS 0
 %define HAVE_W32THREADS 1
 %define HAVE_AS_DN_DIRECTIVE 0
-%define HAVE_AS_FUNC 1
+%define HAVE_AS_FUNC 0
 %define HAVE_ASM_MOD_Q 0
 %define HAVE_ATTRIBUTE_MAY_ALIAS 0
 %define HAVE_ATTRIBUTE_PACKED 0
 %define HAVE_EBP_AVAILABLE 0
 %define HAVE_EBX_AVAILABLE 0
-%define HAVE_GNU_AS 1
+%define HAVE_GNU_AS 0
 %define HAVE_GNU_WINDRES 0
 %define HAVE_IBM_ASM 0
 %define HAVE_INLINE_ASM_LABELS 0
@ -282,6 +293,7 @@
 %define HAVE_VFP_ARGS 0
 %define HAVE_XFORM_ASM 0
 %define HAVE_XMM_CLOBBERS 0
+%define HAVE_CONDITION_VARIABLE_PTR 1
 %define HAVE_SOCKLEN_T 0
 %define HAVE_STRUCT_ADDRINFO 0
 %define HAVE_STRUCT_GROUP_SOURCE_REQ 0
@ -303,6 +315,7 @@
 %define HAVE_LIBDC1394_1 0
 %define HAVE_LIBDC1394_2 0
 %define HAVE_MAKEINFO 1
+%define HAVE_MAKEINFO_HTML 0
 %define HAVE_PERL 1
 %define HAVE_POD2MAN 0
 %define HAVE_SDL 0
@ -329,6 +342,7 @@
 %define CONFIG_AVIO_READING_EXAMPLE 1
 %define CONFIG_DECODING_ENCODING_EXAMPLE 1
 %define CONFIG_DEMUXING_DECODING_EXAMPLE 1
+%define CONFIG_EXTRACT_MVS_EXAMPLE 1
 %define CONFIG_FILTER_AUDIO_EXAMPLE 0
 %define CONFIG_FILTERING_AUDIO_EXAMPLE 0
 %define CONFIG_FILTERING_VIDEO_EXAMPLE 0
@ -360,6 +374,7 @@
 %define CONFIG_LIBFLITE 0
 %define CONFIG_LIBFONTCONFIG 0
 %define CONFIG_LIBFREETYPE 0
+%define CONFIG_LIBFRIBIDI 0
 %define CONFIG_LIBGME 0
 %define CONFIG_LIBGSM 0
 %define CONFIG_LIBIEC61883 0
@ -377,6 +392,7 @@
 %define CONFIG_LIBRTMP 0
 %define CONFIG_LIBSCHROEDINGER 0
 %define CONFIG_LIBSHINE 0
+%define CONFIG_LIBSMBCLIENT 0
 %define CONFIG_LIBSOXR 0
 %define CONFIG_LIBSPEEX 0
 %define CONFIG_LIBSSH 0
@ -395,13 +411,19 @@
 %define CONFIG_LIBX264 0
 %define CONFIG_LIBX265 0
 %define CONFIG_LIBXAVS 0
+%define CONFIG_LIBXCB 0
+%define CONFIG_LIBXCB_SHM 0
+%define CONFIG_LIBXCB_SHAPE 0
+%define CONFIG_LIBXCB_XFIXES 0
 %define CONFIG_LIBXVID 0
 %define CONFIG_LIBZMQ 0
 %define CONFIG_LIBZVBI 0
+%define CONFIG_LZMA 0
 %define CONFIG_OPENAL 0
 %define CONFIG_OPENCL 0
 %define CONFIG_OPENGL 0
 %define CONFIG_OPENSSL 0
+%define CONFIG_SDL 0
 %define CONFIG_X11GRAB 0
 %define CONFIG_XLIB 0
 %define CONFIG_ZLIB 1
@ -412,7 +434,6 @@
 %define CONFIG_SAFE_BITSTREAM_READER 1
 %define CONFIG_SHARED 0
 %define CONFIG_SMALL 0
-%define CONFIG_SRAM 0
 %define CONFIG_STATIC 1
 %define CONFIG_SWSCALE_ALPHA 1
 %define CONFIG_DXVA2 1
@ -439,11 +460,13 @@
 %define CONFIG_DCT 1
 %define CONFIG_DWT 1
 %define CONFIG_ERROR_RESILIENCE 1
+%define CONFIG_FAAN 1
 %define CONFIG_FAST_UNALIGNED 1
 %define CONFIG_FFT 1
 %define CONFIG_LSP 1
 %define CONFIG_LZO 1
 %define CONFIG_MDCT 1
+%define CONFIG_PIXELUTILS 0
 %define CONFIG_NETWORK 0
 %define CONFIG_RDFT 1
 %define CONFIG_FONTCONFIG 0
@ -459,9 +482,15 @@
 %define CONFIG_AANDCTTABLES 1
 %define CONFIG_AC3DSP 1
 %define CONFIG_AUDIO_FRAME_QUEUE 0
+%define CONFIG_AUDIODSP 1
+%define CONFIG_BLOCKDSP 1
+%define CONFIG_BSWAPDSP 1
 %define CONFIG_CABAC 1
-%define CONFIG_DSPUTIL 1
+%define CONFIG_DVPROFILE 1
 %define CONFIG_EXIF 1
+%define CONFIG_FAANDCT 1
+%define CONFIG_FAANIDCT 1
+%define CONFIG_FDCTDSP 1
 %define CONFIG_FRAME_THREAD_ENCODER 0
 %define CONFIG_GCRYPT 0
 %define CONFIG_GOLOMB 1
@ -475,16 +504,21 @@
 %define CONFIG_HUFFMAN 1
 %define CONFIG_HUFFYUVDSP 1
 %define CONFIG_HUFFYUVENCDSP 0
+%define CONFIG_IDCTDSP 1
+%define CONFIG_IIRFILTER 0
 %define CONFIG_INTRAX8 1
 %define CONFIG_LGPLV3 0
 %define CONFIG_LLAUDDSP 1
 %define CONFIG_LLVIDDSP 1
 %define CONFIG_LPC 0
+%define CONFIG_ME_CMP 1
+%define CONFIG_MPEG_ER 1
 %define CONFIG_MPEGAUDIO 1
 %define CONFIG_MPEGAUDIODSP 1
 %define CONFIG_MPEGVIDEO 1
-%define CONFIG_MPEGVIDEOENC 0
+%define CONFIG_MPEGVIDEOENC 1
 %define CONFIG_NETTLE 0
+%define CONFIG_PIXBLOCKDSP 1
 %define CONFIG_QPELDSP 1
 %define CONFIG_RANGECODER 1
 %define CONFIG_RIFFDEC 1
@ -492,9 +526,11 @@
 %define CONFIG_RTPDEC 0
 %define CONFIG_RTPENC_CHAIN 0
 %define CONFIG_SINEWIN 1
+%define CONFIG_STARTCODE 1
 %define CONFIG_TPELDSP 1
 %define CONFIG_VIDEODSP 1
 %define CONFIG_VP3DSP 1
+%define CONFIG_WMA_FREQS 1
 %define CONFIG_AAC_ADTSTOASC_BSF 1
 %define CONFIG_CHOMP_BSF 1
 %define CONFIG_DUMP_EXTRADATA_BSF 1
@ -513,6 +549,7 @@
 %define CONFIG_AMV_DECODER 1
 %define CONFIG_ANM_DECODER 1
 %define CONFIG_ANSI_DECODER 1
+%define CONFIG_APNG_DECODER 1
 %define CONFIG_ASV1_DECODER 1
 %define CONFIG_ASV2_DECODER 1
 %define CONFIG_AURA_DECODER 1
@ -881,6 +918,7 @@
 %define CONFIG_REALTEXT_DECODER 1
 %define CONFIG_SAMI_DECODER 1
 %define CONFIG_SRT_DECODER 1
+%define CONFIG_STL_DECODER 1
 %define CONFIG_SUBRIP_DECODER 1
 %define CONFIG_SUBVIEWER_DECODER 1
 %define CONFIG_SUBVIEWER1_DECODER 1
@ -921,6 +959,7 @@
 %define CONFIG_ANM_DEMUXER 1
 %define CONFIG_APC_DEMUXER 1
 %define CONFIG_APE_DEMUXER 1
+%define CONFIG_APNG_DEMUXER 1
 %define CONFIG_AQTITLE_DEMUXER 1
 %define CONFIG_ASF_DEMUXER 1
 %define CONFIG_ASS_DEMUXER 1
@ -966,6 +1005,7 @@
 %define CONFIG_FLAC_DEMUXER 1
 %define CONFIG_FLIC_DEMUXER 1
 %define CONFIG_FLV_DEMUXER 1
+%define CONFIG_LIVE_FLV_DEMUXER 1
 %define CONFIG_FOURXM_DEMUXER 1
 %define CONFIG_FRM_DEMUXER 1
 %define CONFIG_G722_DEMUXER 1
@ -1000,6 +1040,7 @@
 %define CONFIG_LATM_DEMUXER 1
 %define CONFIG_LMLM4_DEMUXER 1
 %define CONFIG_LOAS_DEMUXER 1
+%define CONFIG_LRC_DEMUXER 1
 %define CONFIG_LVF_DEMUXER 1
 %define CONFIG_LXF_DEMUXER 1
 %define CONFIG_M4V_DEMUXER 1
@ -1089,8 +1130,10 @@
 %define CONFIG_SPDIF_DEMUXER 1
 %define CONFIG_SRT_DEMUXER 1
 %define CONFIG_STR_DEMUXER 1
+%define CONFIG_STL_DEMUXER 1
 %define CONFIG_SUBVIEWER1_DEMUXER 1
 %define CONFIG_SUBVIEWER_DEMUXER 1
+%define CONFIG_SUP_DEMUXER 1
 %define CONFIG_SWF_DEMUXER 1
 %define CONFIG_TAK_DEMUXER 1
 %define CONFIG_TEDCAPTIONS_DEMUXER 1
@ -1112,6 +1155,7 @@
 %define CONFIG_W64_DEMUXER 1
 %define CONFIG_WAV_DEMUXER 1
 %define CONFIG_WC3_DEMUXER 1
+%define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 1
 %define CONFIG_WEBVTT_DEMUXER 1
 %define CONFIG_WSAUD_DEMUXER 1
 %define CONFIG_WSVQA_DEMUXER 1
@ -1123,6 +1167,18 @@
 %define CONFIG_XWMA_DEMUXER 1
 %define CONFIG_YOP_DEMUXER 1
 %define CONFIG_YUV4MPEGPIPE_DEMUXER 1
+%define CONFIG_IMAGE_BMP_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_DPX_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_EXR_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_J2K_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_PNG_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_SGI_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_WEBP_PIPE_DEMUXER 1
 %define CONFIG_LIBGME_DEMUXER 0
 %define CONFIG_LIBMODPLUG_DEMUXER 0
 %define CONFIG_LIBNUT_DEMUXER 0
@ -1292,7 +1348,6 @@
 %define CONFIG_LIBXAVS_ENCODER 0
 %define CONFIG_LIBXVID_ENCODER 0
 %define CONFIG_LIBAACPLUS_ENCODER 0
-%define CONFIG_ACONVERT_FILTER 0
 %define CONFIG_ADELAY_FILTER 0
 %define CONFIG_AECHO_FILTER 0
 %define CONFIG_AEVAL_FILTER 0
@ -1332,6 +1387,7 @@
 %define CONFIG_EARWAX_FILTER 0
 %define CONFIG_EBUR128_FILTER 0
 %define CONFIG_EQUALIZER_FILTER 0
+%define CONFIG_FLANGER_FILTER 0
 %define CONFIG_HIGHPASS_FILTER 0
 %define CONFIG_JOIN_FILTER 0
 %define CONFIG_LADSPA_FILTER 0
@ -1340,6 +1396,7 @@
 %define CONFIG_REPLAYGAIN_FILTER 0
 %define CONFIG_RESAMPLE_FILTER 0
 %define CONFIG_SILENCEDETECT_FILTER 0
+%define CONFIG_SILENCEREMOVE_FILTER 0
 %define CONFIG_TREBLE_FILTER 0
 %define CONFIG_VOLUME_FILTER 0
 %define CONFIG_VOLUMEDETECT_FILTER 0
@ -1356,6 +1413,7 @@
 %define CONFIG_BLACKFRAME_FILTER 0
 %define CONFIG_BLEND_FILTER 0
 %define CONFIG_BOXBLUR_FILTER 0
+%define CONFIG_CODECVIEW_FILTER 0
 %define CONFIG_COLORBALANCE_FILTER 0
 %define CONFIG_COLORCHANNELMIXER_FILTER 0
 %define CONFIG_COLORMATRIX_FILTER 0
@ -1390,12 +1448,14 @@
 %define CONFIG_HISTEQ_FILTER 0
 %define CONFIG_HISTOGRAM_FILTER 0
 %define CONFIG_HQDN3D_FILTER 0
+%define CONFIG_HQX_FILTER 0
 %define CONFIG_HUE_FILTER 0
 %define CONFIG_IDET_FILTER 0
 %define CONFIG_IL_FILTER 0
 %define CONFIG_INTERLACE_FILTER 0
 %define CONFIG_INTERLEAVE_FILTER 0
 %define CONFIG_KERNDEINT_FILTER 0
+%define CONFIG_LENSCORRECTION_FILTER 0
 %define CONFIG_LUT3D_FILTER 0
 %define CONFIG_LUT_FILTER 0
 %define CONFIG_LUTRGB_FILTER 0
@ -1433,6 +1493,7 @@
 %define CONFIG_SETTB_FILTER 0
 %define CONFIG_SHOWINFO_FILTER 0
 %define CONFIG_SHUFFLEPLANES_FILTER 0
+%define CONFIG_SIGNALSTATS_FILTER 0
 %define CONFIG_SMARTBLUR_FILTER 0
 %define CONFIG_SPLIT_FILTER 0
 %define CONFIG_SPP_FILTER 0
@ -1452,8 +1513,10 @@
 %define CONFIG_VIDSTABTRANSFORM_FILTER 0
 %define CONFIG_VIGNETTE_FILTER 0
 %define CONFIG_W3FDIF_FILTER 0
+%define CONFIG_XBR_FILTER 0
 %define CONFIG_YADIF_FILTER 0
 %define CONFIG_ZMQ_FILTER 0
+%define CONFIG_ZOOMPAN_FILTER 0
 %define CONFIG_CELLAUTO_FILTER 0
 %define CONFIG_COLOR_FILTER 0
 %define CONFIG_FREI0R_SRC_FILTER 0
@ -1498,6 +1561,7 @@
 %define CONFIG_ALSA_INDEV 0
 %define CONFIG_AVFOUNDATION_INDEV 0
 %define CONFIG_BKTR_INDEV 0
+%define CONFIG_DECKLINK_INDEV 0
 %define CONFIG_DSHOW_INDEV 0
 %define CONFIG_DV1394_INDEV 0
 %define CONFIG_FBDEV_INDEV 0
@ -1513,6 +1577,7 @@
 %define CONFIG_V4L2_INDEV 0
 %define CONFIG_VFWCAP_INDEV 0
 %define CONFIG_X11GRAB_INDEV 0
+%define CONFIG_X11GRAB_XCB_INDEV 0
 %define CONFIG_LIBCDIO_INDEV 0
 %define CONFIG_LIBDC1394_INDEV 0
 %define CONFIG_A64_MUXER 0
@ -1532,6 +1597,7 @@
 %define CONFIG_CAF_MUXER 0
 %define CONFIG_CAVSVIDEO_MUXER 0
 %define CONFIG_CRC_MUXER 0
+%define CONFIG_DASH_MUXER 0
 %define CONFIG_DATA_MUXER 0
 %define CONFIG_DAUD_MUXER 0
 %define CONFIG_DIRAC_MUXER 0
@ -1567,6 +1633,7 @@
 %define CONFIG_IVF_MUXER 0
 %define CONFIG_JACOSUB_MUXER 0
 %define CONFIG_LATM_MUXER 0
+%define CONFIG_LRC_MUXER 0
 %define CONFIG_M4V_MUXER 0
 %define CONFIG_MD5_MUXER 0
 %define CONFIG_MATROSKA_MUXER 0
@ -1629,8 +1696,8 @@
 %define CONFIG_SMJPEG_MUXER 0
 %define CONFIG_SMOOTHSTREAMING_MUXER 0
 %define CONFIG_SOX_MUXER 0
+%define CONFIG_SPX_MUXER 0
 %define CONFIG_SPDIF_MUXER 0
-%define CONFIG_SPEEX_MUXER 0
 %define CONFIG_SRT_MUXER 0
 %define CONFIG_SWF_MUXER 0
 %define CONFIG_TEE_MUXER 0
@ -1645,6 +1712,8 @@
 %define CONFIG_W64_MUXER 0
 %define CONFIG_WAV_MUXER 0
 %define CONFIG_WEBM_MUXER 0
+%define CONFIG_WEBM_DASH_MANIFEST_MUXER 0
+%define CONFIG_WEBP_MUXER 0
 %define CONFIG_WEBVTT_MUXER 0
 %define CONFIG_WTV_MUXER 0
 %define CONFIG_WV_MUXER 0
@ -1711,6 +1780,7 @@
 %define CONFIG_HTTP_PROTOCOL 0
 %define CONFIG_HTTPPROXY_PROTOCOL 0
 %define CONFIG_HTTPS_PROTOCOL 0
+%define CONFIG_ICECAST_PROTOCOL 0
 %define CONFIG_MMSH_PROTOCOL 0
 %define CONFIG_MMST_PROTOCOL 0
 %define CONFIG_MD5_PROTOCOL 1
@ -1728,6 +1798,7 @@
 %define CONFIG_TCP_PROTOCOL 0
 %define CONFIG_TLS_PROTOCOL 0
 %define CONFIG_UDP_PROTOCOL 0
+%define CONFIG_UDPLITE_PROTOCOL 0
 %define CONFIG_UNIX_PROTOCOL 0
 %define CONFIG_LIBRTMP_PROTOCOL 0
 %define CONFIG_LIBRTMPE_PROTOCOL 0
@ -1735,3 +1806,4 @@
 %define CONFIG_LIBRTMPT_PROTOCOL 0
 %define CONFIG_LIBRTMPTE_PROTOCOL 0
 %define CONFIG_LIBSSH_PROTOCOL 0
+%define CONFIG_LIBSMBCLIENT_PROTOCOL 0
--- a/build/ffmpeg/config-x86.h
+++ b/build/ffmpeg/config-x86.h
@ -6,13 +6,14 @@
 #define CONFIG_THIS_YEAR 2014
 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
 #define AVCONV_DATADIR "/usr/local/share/ffmpeg"
-#define CC_IDENT "Microsoft (R) C/C++ Optimizing Compiler Version 18.00.30324 for x86"
+#define CC_IDENT "Microsoft (R) C/C++ Optimizing Compiler Version 18.00.31101 for x86"
 #define av_restrict __restrict
 #define EXTERN_PREFIX "_"
 #define EXTERN_ASM _
 #define BUILDSUF ""
 #define SLIBSUF ".dll"
 #define HAVE_MMX2 HAVE_MMXEXT
+#define SWS_MAX_FILTER_SIZE 256
 #define ARCH_AARCH64 0
 #define ARCH_ALPHA 0
 #define ARCH_ARM 0
@ -44,10 +45,12 @@
 #define HAVE_NEON 0
 #define HAVE_VFP 0
 #define HAVE_VFPV3 0
+#define HAVE_SETEND 0
 #define HAVE_ALTIVEC 0
 #define HAVE_DCBZL 1
 #define HAVE_LDBRX 1
 #define HAVE_PPC4XX 0
+#define HAVE_VSX 0
 #define HAVE_AMD3DNOW 1
 #define HAVE_AMD3DNOWEXT 1
 #define HAVE_AVX 1
@ -77,10 +80,12 @@
 #define HAVE_NEON_EXTERNAL 0
 #define HAVE_VFP_EXTERNAL 0
 #define HAVE_VFPV3_EXTERNAL 0
+#define HAVE_SETEND_EXTERNAL 0
 #define HAVE_ALTIVEC_EXTERNAL 0
 #define HAVE_DCBZL_EXTERNAL 0
 #define HAVE_LDBRX_EXTERNAL 0
 #define HAVE_PPC4XX_EXTERNAL 0
+#define HAVE_VSX_EXTERNAL 0
 #define HAVE_AMD3DNOW_EXTERNAL 1
 #define HAVE_AMD3DNOWEXT_EXTERNAL 1
 #define HAVE_AVX_EXTERNAL 1
@ -110,10 +115,12 @@
 #define HAVE_NEON_INLINE 0
 #define HAVE_VFP_INLINE 0
 #define HAVE_VFPV3_INLINE 0
+#define HAVE_SETEND_INLINE 0
 #define HAVE_ALTIVEC_INLINE 0
 #define HAVE_DCBZL_INLINE 0
 #define HAVE_LDBRX_INLINE 0
 #define HAVE_PPC4XX_INLINE 0
+#define HAVE_VSX_INLINE 0
 #define HAVE_AMD3DNOW_INLINE 0
 #define HAVE_AMD3DNOWEXT_INLINE 0
 #define HAVE_AVX_INLINE 0
@ -143,10 +150,12 @@
 #define HAVE_LOCAL_ALIGNED_8 1
 #define HAVE_LOCAL_ALIGNED_16 1
 #define HAVE_LOCAL_ALIGNED_32 1
+#define HAVE_SIMD_ALIGN_16 1
 #define HAVE_ATOMICS_GCC 0
 #define HAVE_ATOMICS_SUNCC 0
 #define HAVE_ATOMICS_WIN32 1
 #define HAVE_ATOMIC_CAS_PTR 0
+#define HAVE_ATOMIC_COMPARE_EXCHANGE 0
 #define HAVE_MACHINE_RW_BARRIER 0
 #define HAVE_MEMORYBARRIER 1
 #define HAVE_MM_EMPTY 1
@ -195,9 +204,11 @@
 #define HAVE_SYS_UN_H 0
 #define HAVE_SYS_VIDEOIO_H 0
 #define HAVE_TERMIOS_H 0
+#define HAVE_UDPLITE_H 0
 #define HAVE_UNISTD_H 0
 #define HAVE_WINDOWS_H 1
 #define HAVE_WINSOCK2_H 0
+#define HAVE_INTRINSICS_NEON 0
 #define HAVE_ATANF 1
 #define HAVE_ATAN2F 1
 #define HAVE_CBRT 1
@ -206,7 +217,6 @@
 #define HAVE_EXP2 1
 #define HAVE_EXP2F 1
 #define HAVE_EXPF 1
-#define HAVE_FMINF 1
 #define HAVE_ISINF 1
 #define HAVE_ISNAN 1
 #define HAVE_LDEXPF 1
@ -247,6 +257,7 @@
 #define HAVE_GETTIMEOFDAY 0
 #define HAVE_GLOB 0
 #define HAVE_GLXGETPROCADDRESS 0
+#define HAVE_GMTIME_R 0
 #define HAVE_INET_ATON 0
 #define HAVE_ISATTY 1
 #define HAVE_JACK_PORT_GET_LATENCY_RANGE 0
@ -255,6 +266,7 @@
 #define HAVE_LZO1X_999_COMPRESS 0
 #define HAVE_MACH_ABSOLUTE_TIME 0
 #define HAVE_MAPVIEWOFFILE 1
+#define HAVE_MOVEFILEEXA 1
 #define HAVE_MEMALIGN 0
 #define HAVE_MKSTEMP 0
 #define HAVE_MMAP 0
@ -278,13 +290,13 @@
 #define HAVE_OS2THREADS 0
 #define HAVE_W32THREADS 1
 #define HAVE_AS_DN_DIRECTIVE 0
-#define HAVE_AS_FUNC 1
+#define HAVE_AS_FUNC 0
 #define HAVE_ASM_MOD_Q 0
 #define HAVE_ATTRIBUTE_MAY_ALIAS 0
 #define HAVE_ATTRIBUTE_PACKED 0
 #define HAVE_EBP_AVAILABLE 0
 #define HAVE_EBX_AVAILABLE 0
-#define HAVE_GNU_AS 1
+#define HAVE_GNU_AS 0
 #define HAVE_GNU_WINDRES 0
 #define HAVE_IBM_ASM 0
 #define HAVE_INLINE_ASM_LABELS 0
@ -297,6 +309,7 @@
 #define HAVE_VFP_ARGS 0
 #define HAVE_XFORM_ASM 0
 #define HAVE_XMM_CLOBBERS 0
+#define HAVE_CONDITION_VARIABLE_PTR 1
 #define HAVE_SOCKLEN_T 0
 #define HAVE_STRUCT_ADDRINFO 0
 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0
@ -318,6 +331,7 @@
 #define HAVE_LIBDC1394_1 0
 #define HAVE_LIBDC1394_2 0
 #define HAVE_MAKEINFO 1
+#define HAVE_MAKEINFO_HTML 0
 #define HAVE_PERL 1
 #define HAVE_POD2MAN 0
 #define HAVE_SDL 0
@ -344,6 +358,7 @@
 #define CONFIG_AVIO_READING_EXAMPLE 1
 #define CONFIG_DECODING_ENCODING_EXAMPLE 1
 #define CONFIG_DEMUXING_DECODING_EXAMPLE 1
+#define CONFIG_EXTRACT_MVS_EXAMPLE 1
 #define CONFIG_FILTER_AUDIO_EXAMPLE 0
 #define CONFIG_FILTERING_AUDIO_EXAMPLE 0
 #define CONFIG_FILTERING_VIDEO_EXAMPLE 0
@ -375,6 +390,7 @@
 #define CONFIG_LIBFLITE 0
 #define CONFIG_LIBFONTCONFIG 0
 #define CONFIG_LIBFREETYPE 0
+#define CONFIG_LIBFRIBIDI 0
 #define CONFIG_LIBGME 0
 #define CONFIG_LIBGSM 0
 #define CONFIG_LIBIEC61883 0
@ -392,6 +408,7 @@
 #define CONFIG_LIBRTMP 0
 #define CONFIG_LIBSCHROEDINGER 0
 #define CONFIG_LIBSHINE 0
+#define CONFIG_LIBSMBCLIENT 0
 #define CONFIG_LIBSOXR 0
 #define CONFIG_LIBSPEEX 0
 #define CONFIG_LIBSSH 0
@ -410,13 +427,19 @@
 #define CONFIG_LIBX264 0
 #define CONFIG_LIBX265 0
 #define CONFIG_LIBXAVS 0
+#define CONFIG_LIBXCB 0
+#define CONFIG_LIBXCB_SHM 0
+#define CONFIG_LIBXCB_SHAPE 0
+#define CONFIG_LIBXCB_XFIXES 0
 #define CONFIG_LIBXVID 0
 #define CONFIG_LIBZMQ 0
 #define CONFIG_LIBZVBI 0
+#define CONFIG_LZMA 0
 #define CONFIG_OPENAL 0
 #define CONFIG_OPENCL 0
 #define CONFIG_OPENGL 0
 #define CONFIG_OPENSSL 0
+#define CONFIG_SDL 0
 #define CONFIG_X11GRAB 0
 #define CONFIG_XLIB 0
 #define CONFIG_ZLIB 1
@ -427,7 +450,6 @@
 #define CONFIG_SAFE_BITSTREAM_READER 1
 #define CONFIG_SHARED 0
 #define CONFIG_SMALL 0
-#define CONFIG_SRAM 0
 #define CONFIG_STATIC 1
 #define CONFIG_SWSCALE_ALPHA 1
 #define CONFIG_DXVA2 1
@ -454,11 +476,13 @@
 #define CONFIG_DCT 1
 #define CONFIG_DWT 1
 #define CONFIG_ERROR_RESILIENCE 1
+#define CONFIG_FAAN 1
 #define CONFIG_FAST_UNALIGNED 1
 #define CONFIG_FFT 1
 #define CONFIG_LSP 1
 #define CONFIG_LZO 1
 #define CONFIG_MDCT 1
+#define CONFIG_PIXELUTILS 0
 #define CONFIG_NETWORK 0
 #define CONFIG_RDFT 1
 #define CONFIG_FONTCONFIG 0
@ -474,9 +498,15 @@
 #define CONFIG_AANDCTTABLES 1
 #define CONFIG_AC3DSP 1
 #define CONFIG_AUDIO_FRAME_QUEUE 0
+#define CONFIG_AUDIODSP 1
+#define CONFIG_BLOCKDSP 1
+#define CONFIG_BSWAPDSP 1
 #define CONFIG_CABAC 1
-#define CONFIG_DSPUTIL 1
+#define CONFIG_DVPROFILE 1
 #define CONFIG_EXIF 1
+#define CONFIG_FAANDCT 1
+#define CONFIG_FAANIDCT 1
+#define CONFIG_FDCTDSP 1
 #define CONFIG_FRAME_THREAD_ENCODER 0
 #define CONFIG_GCRYPT 0
 #define CONFIG_GOLOMB 1
@ -490,16 +520,21 @@
 #define CONFIG_HUFFMAN 1
 #define CONFIG_HUFFYUVDSP 1
 #define CONFIG_HUFFYUVENCDSP 0
+#define CONFIG_IDCTDSP 1
+#define CONFIG_IIRFILTER 0
 #define CONFIG_INTRAX8 1
 #define CONFIG_LGPLV3 0
 #define CONFIG_LLAUDDSP 1
 #define CONFIG_LLVIDDSP 1
 #define CONFIG_LPC 0
+#define CONFIG_ME_CMP 1
+#define CONFIG_MPEG_ER 1
 #define CONFIG_MPEGAUDIO 1
 #define CONFIG_MPEGAUDIODSP 1
 #define CONFIG_MPEGVIDEO 1
-#define CONFIG_MPEGVIDEOENC 0
+#define CONFIG_MPEGVIDEOENC 1
 #define CONFIG_NETTLE 0
+#define CONFIG_PIXBLOCKDSP 1
 #define CONFIG_QPELDSP 1
 #define CONFIG_RANGECODER 1
 #define CONFIG_RIFFDEC 1
@ -507,9 +542,11 @@
 #define CONFIG_RTPDEC 0
 #define CONFIG_RTPENC_CHAIN 0
 #define CONFIG_SINEWIN 1
+#define CONFIG_STARTCODE 1
 #define CONFIG_TPELDSP 1
 #define CONFIG_VIDEODSP 1
 #define CONFIG_VP3DSP 1
+#define CONFIG_WMA_FREQS 1
 #define CONFIG_AAC_ADTSTOASC_BSF 1
 #define CONFIG_CHOMP_BSF 1
 #define CONFIG_DUMP_EXTRADATA_BSF 1
@ -528,6 +565,7 @@
 #define CONFIG_AMV_DECODER 1
 #define CONFIG_ANM_DECODER 1
 #define CONFIG_ANSI_DECODER 1
+#define CONFIG_APNG_DECODER 1
 #define CONFIG_ASV1_DECODER 1
 #define CONFIG_ASV2_DECODER 1
 #define CONFIG_AURA_DECODER 1
@ -896,6 +934,7 @@
 #define CONFIG_REALTEXT_DECODER 1
 #define CONFIG_SAMI_DECODER 1
 #define CONFIG_SRT_DECODER 1
+#define CONFIG_STL_DECODER 1
 #define CONFIG_SUBRIP_DECODER 1
 #define CONFIG_SUBVIEWER_DECODER 1
 #define CONFIG_SUBVIEWER1_DECODER 1
@ -936,6 +975,7 @@
 #define CONFIG_ANM_DEMUXER 1
 #define CONFIG_APC_DEMUXER 1
 #define CONFIG_APE_DEMUXER 1
+#define CONFIG_APNG_DEMUXER 1
 #define CONFIG_AQTITLE_DEMUXER 1
 #define CONFIG_ASF_DEMUXER 1
 #define CONFIG_ASS_DEMUXER 1
@ -981,6 +1021,7 @@
 #define CONFIG_FLAC_DEMUXER 1
 #define CONFIG_FLIC_DEMUXER 1
 #define CONFIG_FLV_DEMUXER 1
+#define CONFIG_LIVE_FLV_DEMUXER 1
 #define CONFIG_FOURXM_DEMUXER 1
 #define CONFIG_FRM_DEMUXER 1
 #define CONFIG_G722_DEMUXER 1
@ -1015,6 +1056,7 @@
 #define CONFIG_LATM_DEMUXER 1
 #define CONFIG_LMLM4_DEMUXER 1
 #define CONFIG_LOAS_DEMUXER 1
+#define CONFIG_LRC_DEMUXER 1
 #define CONFIG_LVF_DEMUXER 1
 #define CONFIG_LXF_DEMUXER 1
 #define CONFIG_M4V_DEMUXER 1
@ -1104,8 +1146,10 @@
 #define CONFIG_SPDIF_DEMUXER 1
 #define CONFIG_SRT_DEMUXER 1
 #define CONFIG_STR_DEMUXER 1
+#define CONFIG_STL_DEMUXER 1
 #define CONFIG_SUBVIEWER1_DEMUXER 1
 #define CONFIG_SUBVIEWER_DEMUXER 1
+#define CONFIG_SUP_DEMUXER 1
 #define CONFIG_SWF_DEMUXER 1
 #define CONFIG_TAK_DEMUXER 1
 #define CONFIG_TEDCAPTIONS_DEMUXER 1
@ -1127,6 +1171,7 @@
 #define CONFIG_W64_DEMUXER 1
 #define CONFIG_WAV_DEMUXER 1
 #define CONFIG_WC3_DEMUXER 1
+#define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 1
 #define CONFIG_WEBVTT_DEMUXER 1
 #define CONFIG_WSAUD_DEMUXER 1
 #define CONFIG_WSVQA_DEMUXER 1
@ -1138,6 +1183,18 @@
 #define CONFIG_XWMA_DEMUXER 1
 #define CONFIG_YOP_DEMUXER 1
 #define CONFIG_YUV4MPEGPIPE_DEMUXER 1
+#define CONFIG_IMAGE_BMP_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_DPX_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_EXR_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_J2K_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_PNG_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_SGI_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_WEBP_PIPE_DEMUXER 1
 #define CONFIG_LIBGME_DEMUXER 0
 #define CONFIG_LIBMODPLUG_DEMUXER 0
 #define CONFIG_LIBNUT_DEMUXER 0
@ -1307,7 +1364,6 @@
 #define CONFIG_LIBXAVS_ENCODER 0
 #define CONFIG_LIBXVID_ENCODER 0
 #define CONFIG_LIBAACPLUS_ENCODER 0
-#define CONFIG_ACONVERT_FILTER 0
 #define CONFIG_ADELAY_FILTER 0
 #define CONFIG_AECHO_FILTER 0
 #define CONFIG_AEVAL_FILTER 0
@ -1347,6 +1403,7 @@
 #define CONFIG_EARWAX_FILTER 0
 #define CONFIG_EBUR128_FILTER 0
 #define CONFIG_EQUALIZER_FILTER 0
+#define CONFIG_FLANGER_FILTER 0
 #define CONFIG_HIGHPASS_FILTER 0
 #define CONFIG_JOIN_FILTER 0
 #define CONFIG_LADSPA_FILTER 0
@ -1355,6 +1412,7 @@
 #define CONFIG_REPLAYGAIN_FILTER 0
 #define CONFIG_RESAMPLE_FILTER 0
 #define CONFIG_SILENCEDETECT_FILTER 0
+#define CONFIG_SILENCEREMOVE_FILTER 0
 #define CONFIG_TREBLE_FILTER 0
 #define CONFIG_VOLUME_FILTER 0
 #define CONFIG_VOLUMEDETECT_FILTER 0
@ -1371,6 +1429,7 @@
 #define CONFIG_BLACKFRAME_FILTER 0
 #define CONFIG_BLEND_FILTER 0
 #define CONFIG_BOXBLUR_FILTER 0
+#define CONFIG_CODECVIEW_FILTER 0
 #define CONFIG_COLORBALANCE_FILTER 0
 #define CONFIG_COLORCHANNELMIXER_FILTER 0
 #define CONFIG_COLORMATRIX_FILTER 0
@ -1405,12 +1464,14 @@
 #define CONFIG_HISTEQ_FILTER 0
 #define CONFIG_HISTOGRAM_FILTER 0
 #define CONFIG_HQDN3D_FILTER 0
+#define CONFIG_HQX_FILTER 0
 #define CONFIG_HUE_FILTER 0
 #define CONFIG_IDET_FILTER 0
 #define CONFIG_IL_FILTER 0
 #define CONFIG_INTERLACE_FILTER 0
 #define CONFIG_INTERLEAVE_FILTER 0
 #define CONFIG_KERNDEINT_FILTER 0
+#define CONFIG_LENSCORRECTION_FILTER 0
 #define CONFIG_LUT3D_FILTER 0
 #define CONFIG_LUT_FILTER 0
 #define CONFIG_LUTRGB_FILTER 0
@ -1448,6 +1509,7 @@
 #define CONFIG_SETTB_FILTER 0
 #define CONFIG_SHOWINFO_FILTER 0
 #define CONFIG_SHUFFLEPLANES_FILTER 0
+#define CONFIG_SIGNALSTATS_FILTER 0
 #define CONFIG_SMARTBLUR_FILTER 0
 #define CONFIG_SPLIT_FILTER 0
 #define CONFIG_SPP_FILTER 0
@ -1467,8 +1529,10 @@
 #define CONFIG_VIDSTABTRANSFORM_FILTER 0
 #define CONFIG_VIGNETTE_FILTER 0
 #define CONFIG_W3FDIF_FILTER 0
+#define CONFIG_XBR_FILTER 0
 #define CONFIG_YADIF_FILTER 0
 #define CONFIG_ZMQ_FILTER 0
+#define CONFIG_ZOOMPAN_FILTER 0
 #define CONFIG_CELLAUTO_FILTER 0
 #define CONFIG_COLOR_FILTER 0
 #define CONFIG_FREI0R_SRC_FILTER 0
@ -1513,6 +1577,7 @@
 #define CONFIG_ALSA_INDEV 0
 #define CONFIG_AVFOUNDATION_INDEV 0
 #define CONFIG_BKTR_INDEV 0
+#define CONFIG_DECKLINK_INDEV 0
 #define CONFIG_DSHOW_INDEV 0
 #define CONFIG_DV1394_INDEV 0
 #define CONFIG_FBDEV_INDEV 0
@ -1528,6 +1593,7 @@
 #define CONFIG_V4L2_INDEV 0
 #define CONFIG_VFWCAP_INDEV 0
 #define CONFIG_X11GRAB_INDEV 0
+#define CONFIG_X11GRAB_XCB_INDEV 0
 #define CONFIG_LIBCDIO_INDEV 0
 #define CONFIG_LIBDC1394_INDEV 0
 #define CONFIG_A64_MUXER 0
@ -1547,6 +1613,7 @@
 #define CONFIG_CAF_MUXER 0
 #define CONFIG_CAVSVIDEO_MUXER 0
 #define CONFIG_CRC_MUXER 0
+#define CONFIG_DASH_MUXER 0
 #define CONFIG_DATA_MUXER 0
 #define CONFIG_DAUD_MUXER 0
 #define CONFIG_DIRAC_MUXER 0
@ -1582,6 +1649,7 @@
 #define CONFIG_IVF_MUXER 0
 #define CONFIG_JACOSUB_MUXER 0
 #define CONFIG_LATM_MUXER 0
+#define CONFIG_LRC_MUXER 0
 #define CONFIG_M4V_MUXER 0
 #define CONFIG_MD5_MUXER 0
 #define CONFIG_MATROSKA_MUXER 0
@ -1644,8 +1712,8 @@
 #define CONFIG_SMJPEG_MUXER 0
 #define CONFIG_SMOOTHSTREAMING_MUXER 0
 #define CONFIG_SOX_MUXER 0
+#define CONFIG_SPX_MUXER 0
 #define CONFIG_SPDIF_MUXER 0
-#define CONFIG_SPEEX_MUXER 0
 #define CONFIG_SRT_MUXER 0
 #define CONFIG_SWF_MUXER 0
 #define CONFIG_TEE_MUXER 0
@ -1660,6 +1728,8 @@
 #define CONFIG_W64_MUXER 0
 #define CONFIG_WAV_MUXER 0
 #define CONFIG_WEBM_MUXER 0
+#define CONFIG_WEBM_DASH_MANIFEST_MUXER 0
+#define CONFIG_WEBP_MUXER 0
 #define CONFIG_WEBVTT_MUXER 0
 #define CONFIG_WTV_MUXER 0
 #define CONFIG_WV_MUXER 0
@ -1726,6 +1796,7 @@
 #define CONFIG_HTTP_PROTOCOL 0
 #define CONFIG_HTTPPROXY_PROTOCOL 0
 #define CONFIG_HTTPS_PROTOCOL 0
+#define CONFIG_ICECAST_PROTOCOL 0
 #define CONFIG_MMSH_PROTOCOL 0
 #define CONFIG_MMST_PROTOCOL 0
 #define CONFIG_MD5_PROTOCOL 1
@ -1743,6 +1814,7 @@
 #define CONFIG_TCP_PROTOCOL 0
 #define CONFIG_TLS_PROTOCOL 0
 #define CONFIG_UDP_PROTOCOL 0
+#define CONFIG_UDPLITE_PROTOCOL 0
 #define CONFIG_UNIX_PROTOCOL 0
 #define CONFIG_LIBRTMP_PROTOCOL 0
 #define CONFIG_LIBRTMPE_PROTOCOL 0
@ -1750,4 +1822,5 @@
 #define CONFIG_LIBRTMPT_PROTOCOL 0
 #define CONFIG_LIBRTMPTE_PROTOCOL 0
 #define CONFIG_LIBSSH_PROTOCOL 0
+#define CONFIG_LIBSMBCLIENT_PROTOCOL 0
 #endif /* FFMPEG_CONFIG_H */
--- a/build/ffmpeg/ffmpeg.vcxproj
+++ b/build/ffmpeg/ffmpeg.vcxproj
@ -142,7 +142,9 @@
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\atrac3plusdec.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\atrac3plusdsp.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\audioconvert.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\audiodsp.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\aura.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\avdct.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\avfft.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\avpacket.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\avpicture.c" />
@ -158,10 +160,13 @@
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\bintext.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\bitstream.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\bitstream_filter.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\blockdsp.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\bmp.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\bmp_parser.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\bmv.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\bmvaudio.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\bmvvideo.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\brenderpix.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\bswapdsp.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\c93.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\cabac.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\cavs.c" />
@ -176,7 +181,7 @@
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\cga_data.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\chomp_bsf.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\cinepak.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\cljr.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\cljrdec.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\cllc.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\cngdec.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\codec_desc.c" />
@ -206,8 +211,8 @@
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dpx.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dpx_parser.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dsddec.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dsicinav.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dsputil.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dsicinaudio.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dsicinvideo.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dump_extradata_bsf.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dv.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dv_profile.c" />
@ -237,6 +242,7 @@
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\exr.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\faanidct.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\faxcompr.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\fdctdsp.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\fft_fixed.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\fft_fixed_32.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\fft_float.c" />
@ -311,6 +317,7 @@
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\huffyuvdec.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\huffyuvdsp.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\idcinvideo.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\idctdsp.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\iff.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\imc.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\imgconvert.c" />
@ -329,6 +336,7 @@
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\jacosubdec.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\jpeg2000.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\jpeg2000dec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\jpeg2000dsp.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\jpeg2000dwt.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\jpegls.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\jpeglsdec.c" />
@ -352,6 +360,7 @@
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mdct_fixed_32.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mdct_float.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mdec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\me_cmp.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\metasound.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\metasound_data.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\microdvddec.c" />
@ -381,6 +390,7 @@
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mpeg4video.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mpeg4video_parser.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mpeg4videodec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mpeg_er.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mpegaudio.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mpegaudio_parser.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mpegaudiodata.c" />
@ -395,6 +405,8 @@
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mpegvideo.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mpegvideo_motion.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mpegvideo_parser.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mpegvideodsp.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mpegvideoencdsp.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mpl2dec.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mqc.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mqcdec.c" />
@ -427,14 +439,18 @@
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\opus_parser.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\opus_silk.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\opusdec.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\paf.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\pafaudio.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\pafvideo.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\parser.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\pcm-bluray.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\pcm-dvd.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\pcm.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\pcx.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\pel_template.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\pgssubdec.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\pictordec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\pixblockdsp.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\pixblockdsp_template.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\png.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\png_parser.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\pngdec.c" />
@ -546,14 +562,19 @@
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vb.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vble.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vc1.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vc1_block.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vc1_loopfilter.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vc1_mc.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vc1_parser.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vc1_pred.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vc1data.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vc1dec.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vc1dsp.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vcr1.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\videodsp.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vima.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vmdav.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vmdaudio.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vmdvideo.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vmnc.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vorbis.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vorbis_data.c" />
@ -582,6 +603,7 @@
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\webvttdec.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\wma.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\wma_common.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\wma_freqs.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\wmadec.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\wmalosslessdec.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\wmaprodec.c" />
@ -592,14 +614,16 @@
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\wnv1.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\ws-snd1.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\ac3dsp_init.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\audiodsp_init.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\blockdsp_init.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\bswapdsp_init.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\cavsdsp.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\constants.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\dcadsp_init.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\dct_init.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\dirac_dwt.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\diracdsp_mmx.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\dsputil_init.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\dsputil_mmx.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\fdctdsp_init.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\fft_init.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\flacdsp_init.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\fmtconvert_init.c" />
@ -611,14 +635,16 @@
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\hevcdsp_init.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\hpeldsp_init.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\huffyuvdsp_init.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\huffyuvdsp_mmx.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\idct_mmx_xvid.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\idct_sse2_xvid.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\idctdsp_init.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\lossless_audiodsp_init.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\lossless_videodsp_init.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\mlpdsp.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\me_cmp_init.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\mlpdsp_init.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\mpegaudiodsp.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\mpegvideo.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\mpegvideodsp.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\mpegvideoencdsp_init.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\pixblockdsp_init.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\pngdsp_init.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\proresdsp_init.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\qpeldsp_init.c" />
@ -637,6 +663,9 @@
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\vp6dsp_init.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\vp8dsp_init.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\vp9dsp_init.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\xvididct_init.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\xvididct_mmx.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\xvididct_sse2.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\xan.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\xbmdec.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\xface.c" />
@ -644,6 +673,7 @@
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\xiph.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\xl.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\xsubdec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\xvididct.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\xwddec.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\xxan.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\y41pdec.c" />
@ -668,6 +698,7 @@
    <ClCompile Include="$(FfmpegSrcDir)\libavformat\apc.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavformat\ape.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavformat\apetag.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\apngdec.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavformat\aqtitledec.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavformat\asf.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavformat\asfcrypt.c" />
@ -703,7 +734,7 @@
    <ClCompile Include="$(FfmpegSrcDir)\libavformat\crypto.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavformat\cutils.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavformat\data_uri.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libavformat\daud.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\dauddec.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavformat\dfa.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavformat\diracdec.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavformat\dnxhddec.c" />
@ -711,6 +742,7 @@
    <ClCompile Include="$(FfmpegSrcDir)\libavformat\dsicin.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavformat\dtsdec.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavformat\dtshddec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\dump.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavformat\dv.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavformat\dxa.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavformat\eacdata.c" />
@ -762,6 +794,8 @@
    <ClCompile Include="$(FfmpegSrcDir)\libavformat\jvdec.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavformat\lmlm4.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavformat\loasdec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\lrc.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\lrcdec.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavformat\lvfdec.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavformat\lxfdec.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavformat\m4vdec.c" />
@ -838,6 +872,8 @@
    <ClCompile Include="$(FfmpegSrcDir)\libavformat\rsd.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavformat\rso.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavformat\rsodec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\rtpdec_h261.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\rtpdec_hevc.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavformat\samidec.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavformat\sauce.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavformat\sbgdec.c" />
@ -856,10 +892,12 @@
    <ClCompile Include="$(FfmpegSrcDir)\libavformat\spdif.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavformat\spdifdec.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavformat\srtdec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\stldec.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavformat\subfile.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavformat\subtitles.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavformat\subviewer1dec.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavformat\subviewerdec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\supdec.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavformat\swf.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavformat\swfdec.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavformat\takdec.c" />
@ -914,6 +952,7 @@
    <ClCompile Include="$(FfmpegSrcDir)\libavutil\blowfish.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavutil\bprint.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavutil\buffer.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavutil\cast5.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavutil\channel_layout.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavutil\cpu.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavutil\crc.c" />
@ -932,11 +971,9 @@
    <ClCompile Include="$(FfmpegSrcDir)\libavutil\hash.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavutil\hmac.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavutil\imgutils.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libavutil\intfloat_readwrite.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavutil\intmath.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavutil\lfg.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libavutil\lls1.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libavutil\lls2.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavutil\lls.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavutil\log.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavutil\log2_tab.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavutil\lzo.c" />
@ -947,6 +984,7 @@
    <ClCompile Include="$(FfmpegSrcDir)\libavutil\opt.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavutil\parseutils.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavutil\pixdesc.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavutil\pixelutils.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavutil\random_seed.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavutil\rational.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavutil\rc4.c" />
@ -963,15 +1001,21 @@
    <ClCompile Include="$(FfmpegSrcDir)\libavutil\x86\cpu.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavutil\x86\float_dsp_init.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavutil\x86\lls_init.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavutil\x86\pixelutils_init.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavutil\xga_font_data.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libavutil\xtea.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libswresample\audioconvert.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libswresample\dither.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libswresample\log2_tab.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libswresample\options.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libswresample\rematrix.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libswresample\resample.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libswresample\resample_dsp.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libswresample\swresample.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libswresample\x86\swresample_x86.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libswresample\swresample_frame.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libswresample\x86\audio_convert_init.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libswresample\x86\rematrix_init.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libswresample\x86\resample_init.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libswscale\hscale_fast_bilinear.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libswscale\input.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libswscale\options.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libswscale\output.c" />
@ -979,6 +1023,7 @@
    <ClCompile Include="$(FfmpegSrcDir)\libswscale\swscale.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libswscale\swscale_unscaled.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libswscale\utils.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libswscale\x86\hscale_fast_bilinear_simd.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libswscale\x86\rgb2rgb.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libswscale\x86\swscale.c" />
    <ClCompile Include="$(FfmpegSrcDir)\libswscale\x86\yuv2rgb.c" />
@ -990,24 +1035,54 @@
      <Destination>libavutil\</Destination>
    </InstallHeaderTo>

-    <InstallHeader Include="$(FfmpegSrcDir)\libavdevice\avdevice.h" />
-    <InstallHeader Include="$(FfmpegSrcDir)\libavdevice\version.h" />
-    <InstallHeader Include="$(FfmpegSrcDir)\libavformat\avformat.h" />
-    <InstallHeader Include="$(FfmpegSrcDir)\libavformat\avio.h" />
-    <InstallHeader Include="$(FfmpegSrcDir)\libavformat\version.h" />
-    <InstallHeader Include="$(FfmpegSrcDir)\libavresample\avresample.h" />
-    <InstallHeader Include="$(FfmpegSrcDir)\libavresample\version.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\audiodsp.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\avcodec.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\avdct.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\avfft.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\blockdsp.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\bswapdsp.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\dv_profile_internal.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\dxva2.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\fdctdsp.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\idctdsp.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\jpeg2000dsp.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\me_cmp.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\mpeg_er.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\mpegvideodsp.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\old_codec_ids.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\pixblockdsp.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\vaapi.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\vc1_common.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\vc1_pred.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\vda.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\vdpau.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\version.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\vorbis_parser_internal.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\wma_freqs.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\x86\fdct.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\x86\idctdsp.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\x86\simple_idct.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\x86\xvididct.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\xvididct.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\xvmc.h" />
-    <InstallHeader Include="$(FfmpegSrcDir)\libswscale/swscale.h" />
-    <InstallHeader Include="$(FfmpegSrcDir)\libswscale/version.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavdevice\avdevice.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavdevice\decklink_common.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavdevice\decklink_common_c.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavdevice\decklink_dec.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavdevice\oss_audio.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavdevice\version.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavfilter\generate_wave_table.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavfilter\interlace.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavfilter\tinterlace.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavfilter\vf_idet.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavfilter\vf_noise.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavformat\apng.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavformat\avformat.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavformat\avio.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavformat\lrc.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavformat\version.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavresample\avresample.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavresample\version.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\adler32.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\aes.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\attributes.h" />
@ -1021,10 +1096,12 @@
    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\bprint.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\bswap.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\buffer.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\cast5.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\channel_layout.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\common.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\cpu.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\crc.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\dict.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\downmix_info.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\error.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\eval.h" />
@ -1034,46 +1111,57 @@
    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\hmac.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\imgutils.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\intfloat.h" />
-    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\intfloat_readwrite.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\intreadwrite.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\lfg.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\lls.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\log.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\lzo.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\macros.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\mathematics.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\md5.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\mem.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\motion_vector.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\murmur3.h" />
-    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\dict.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\old_pix_fmts.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\opt.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\parseutils.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\pixdesc.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\pixelutils.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\pixfmt.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\random_seed.h" />
-    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\replaygain.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\rational.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\replaygain.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\ripemd.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\samplefmt.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\sha.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\sha512.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\stereo3d.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\thread.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\time.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\time_internal.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\timecode.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\timestamp.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\version.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\wchar_filename.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\x86\pixelutils.h" />
    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\xtea.h" />
-    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\lzo.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libswresample\resample.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libswscale/swscale.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libswscale/version.h" />
  </ItemGroup>

  <ItemGroup>
    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\ac3dsp.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\audiodsp.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\blockdsp.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\bswapdsp.asm" />
    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\dcadsp.asm" />
    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\dct32.asm" />
    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\deinterlace.asm" />
    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\diracdsp_yasm.asm" />
-    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\dsputil.asm" />
    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\dwt_yasm.asm" />
    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\fft.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\flac_dsp_gpl.asm" />
    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\flacdsp.asm" />
    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\fmtconvert.asm" />
    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\fpel.asm" />
@ -1091,12 +1179,19 @@
    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\h264_weight.asm" />
    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\h264_weight_10bit.asm" />
    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\hevc_deblock.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\hevc_idct.asm" />
    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\hevc_mc.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\hevc_res_add.asm" />
    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\hpeldsp.asm" />
    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\huffyuvdsp.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\idctdsp.asm" />
    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\imdct36.asm" />
    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\lossless_audiodsp.asm" />
    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\lossless_videodsp.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\me_cmp.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\mlpdsp.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\mpegvideoencdsp.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\pixblockdsp.asm" />
    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\pngdsp.asm" />
    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\proresdsp.asm" />
    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\qpel.asm" />
@ -1117,6 +1212,8 @@
    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\vp9itxfm.asm" />
    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\vp9lpf.asm" />
    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\vp9mc.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavfilter\x86\vf_idet.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavfilter\x86\vf_interlace.asm" />
    <Yasm Include="$(FfmpegSrcDir)\libavresample\x86\audio_convert.asm" />
    <Yasm Include="$(FfmpegSrcDir)\libavresample\x86\audio_mix.asm" />
    <Yasm Include="$(FfmpegSrcDir)\libavresample\x86\dither.asm" />
@ -1124,6 +1221,8 @@
    <Yasm Include="$(FfmpegSrcDir)\libavutil\x86\emms.asm" />
    <Yasm Include="$(FfmpegSrcDir)\libavutil\x86\float_dsp.asm" />
    <Yasm Include="$(FfmpegSrcDir)\libavutil\x86\lls.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavutil\x86\pixelutils.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libswresample\x86\resample.asm" />
    <Yasm Include="$(FfmpegSrcDir)\libswresample\x86\audio_convert.asm" />
    <Yasm Include="$(FfmpegSrcDir)\libswresample\x86\rematrix.asm" />
    <Yasm Include="$(FfmpegSrcDir)\libswscale\x86\input.asm" />
--- a/build/wx/setup-build.h
+++ b/build/wx/setup-build.h
@ -87,6 +87,7 @@
 #define wxUSE_PROPGRID 0
 #define wxUSE_STC 1
 #define wxUSE_GRAPHICS_CONTEXT 1
+#define wxUSE_GRAPHICS_GDIPLUS 1
 #define wxUSE_CONTROLS 1
 #define wxUSE_POPUPWIN 1
 #define wxUSE_TIPWINDOW 0
@ -253,4 +254,6 @@
 #define wxUSE_RICHTOOLTIP 0
 #define wxUSE_COMPILER_TLS 2
 #define wxUSE_PREFERENCES_EDITOR 0
+#define wxUSE_STD_CONTAINERS_COMPATIBLY 0
+#define wxUSE_TASKBARBUTTON 0
 #endif
--- a/vendor/ffmpeg
+++ b/vendor/ffmpeg
@ -1 +1 @@
-Subproject commit 049b20b287397b68804649673da32043d3908b77
+Subproject commit 79440651149c89fba9ef5563c9b8a4b3a59acdf5
--- a/vendor/ffms2
+++ b/vendor/ffms2
@ -1 +1 @@
-Subproject commit 30adccf938ab076319bbbb311daa83d98e9fda44
+Subproject commit 7bffd502e2f139c15ac8be11afee136d54791ba0
--- a/vendor/freetype2
+++ b/vendor/freetype2
@ -1 +1 @@
-Subproject commit ed372b712fa698da24c21746135f2c2c8d738c6e
+Subproject commit aaffbf85df8b02b469eb76e22354c2bab6759ae6
--- a/vendor/libass
+++ b/vendor/libass
@ -1 +1 @@
-Subproject commit 042a22af3cb47a3320083a6b3ca8dbd8e255678d
+Subproject commit 507ae26358a491c7f665d32a3e07c2f176d152e9
--- a/vendor/wxWidgets
+++ b/vendor/wxWidgets
@ -1 +1 @@
-Subproject commit 7df5d5a901abb0f34e226d2c9acee94c378f634a
+Subproject commit 54e23e4593decf90ec474e89e733f358973a212a