diff --git a/build/ffmpeg/config-x64.asm b/build/ffmpeg/config-x64.asm
index 9413beaa5..1a0e31ae6 100644
--- a/build/ffmpeg/config-x64.asm
+++ b/build/ffmpeg/config-x64.asm
@@ -191,12 +191,13 @@
%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
%define HAVE_LLRINT 1
%define HAVE_LLRINTF 1
-%define HAVE_LOG2 0
+%define HAVE_LOG2 1
%define HAVE_LOG2F 1
%define HAVE_LOG10F 1
%define HAVE_LRINT 1
@@ -261,6 +262,8 @@
%define HAVE_PTHREADS 0
%define HAVE_OS2THREADS 0
%define HAVE_W32THREADS 1
+%define HAVE_AS_DN_DIRECTIVE 0
+%define HAVE_AS_FUNC 1
%define HAVE_ASM_MOD_Q 0
%define HAVE_ATTRIBUTE_MAY_ALIAS 0
%define HAVE_ATTRIBUTE_PACKED 0
@@ -332,9 +335,9 @@
%define CONFIG_METADATA_EXAMPLE 1
%define CONFIG_MUXING_EXAMPLE 1
%define CONFIG_REMUXING_EXAMPLE 1
-%define CONFIG_RESAMPLING_AUDIO_EXAMPLE 0
+%define CONFIG_RESAMPLING_AUDIO_EXAMPLE 1
%define CONFIG_SCALING_VIDEO_EXAMPLE 1
-%define CONFIG_TRANSCODE_AAC_EXAMPLE 0
+%define CONFIG_TRANSCODE_AAC_EXAMPLE 1
%define CONFIG_TRANSCODING_EXAMPLE 0
%define CONFIG_AVISYNTH 0
%define CONFIG_BZLIB 0
@@ -401,7 +404,7 @@
%define CONFIG_OPENSSL 0
%define CONFIG_X11GRAB 0
%define CONFIG_XLIB 0
-%define CONFIG_ZLIB 0
+%define CONFIG_ZLIB 1
%define CONFIG_FTRAPV 0
%define CONFIG_GRAY 0
%define CONFIG_HARDCODED_TABLES 0
@@ -424,10 +427,10 @@
%define CONFIG_AVDEVICE 1
%define CONFIG_AVFILTER 0
%define CONFIG_AVFORMAT 1
-%define CONFIG_AVRESAMPLE 1
+%define CONFIG_AVRESAMPLE 0
%define CONFIG_AVUTIL 1
%define CONFIG_POSTPROC 0
-%define CONFIG_SWRESAMPLE 0
+%define CONFIG_SWRESAMPLE 1
%define CONFIG_SWSCALE 1
%define CONFIG_FFPLAY 0
%define CONFIG_FFPROBE 0
@@ -470,8 +473,11 @@
%define CONFIG_H264QPEL 1
%define CONFIG_HPELDSP 1
%define CONFIG_HUFFMAN 1
+%define CONFIG_HUFFYUVDSP 1
+%define CONFIG_HUFFYUVENCDSP 0
%define CONFIG_INTRAX8 1
%define CONFIG_LGPLV3 0
+%define CONFIG_LLAUDDSP 1
%define CONFIG_LLVIDDSP 1
%define CONFIG_LPC 0
%define CONFIG_MPEGAUDIO 1
@@ -479,6 +485,7 @@
%define CONFIG_MPEGVIDEO 1
%define CONFIG_MPEGVIDEOENC 0
%define CONFIG_NETTLE 0
+%define CONFIG_QPELDSP 1
%define CONFIG_RANGECODER 1
%define CONFIG_RIFFDEC 1
%define CONFIG_RIFFENC 0
@@ -538,7 +545,7 @@
%define CONFIG_DPX_DECODER 1
%define CONFIG_DSICINVIDEO_DECODER 1
%define CONFIG_DVVIDEO_DECODER 1
-%define CONFIG_DXA_DECODER 0
+%define CONFIG_DXA_DECODER 1
%define CONFIG_DXTORY_DECODER 1
%define CONFIG_EACMV_DECODER 1
%define CONFIG_EAMAD_DECODER 1
@@ -550,18 +557,18 @@
%define CONFIG_EIGHTSVX_FIB_DECODER 1
%define CONFIG_ESCAPE124_DECODER 1
%define CONFIG_ESCAPE130_DECODER 1
-%define CONFIG_EXR_DECODER 0
+%define CONFIG_EXR_DECODER 1
%define CONFIG_FFV1_DECODER 1
%define CONFIG_FFVHUFF_DECODER 1
%define CONFIG_FIC_DECODER 1
-%define CONFIG_FLASHSV_DECODER 0
-%define CONFIG_FLASHSV2_DECODER 0
+%define CONFIG_FLASHSV_DECODER 1
+%define CONFIG_FLASHSV2_DECODER 1
%define CONFIG_FLIC_DECODER 1
%define CONFIG_FLV_DECODER 1
%define CONFIG_FOURXM_DECODER 1
%define CONFIG_FRAPS_DECODER 1
%define CONFIG_FRWU_DECODER 1
-%define CONFIG_G2M_DECODER 0
+%define CONFIG_G2M_DECODER 1
%define CONFIG_GIF_DECODER 1
%define CONFIG_H261_DECODER 1
%define CONFIG_H263_DECODER 1
@@ -666,7 +673,7 @@
%define CONFIG_TMV_DECODER 1
%define CONFIG_TRUEMOTION1_DECODER 1
%define CONFIG_TRUEMOTION2_DECODER 1
-%define CONFIG_TSCC_DECODER 0
+%define CONFIG_TSCC_DECODER 1
%define CONFIG_TSCC2_DECODER 1
%define CONFIG_TXD_DECODER 1
%define CONFIG_ULTI_DECODER 1
@@ -712,9 +719,9 @@
%define CONFIG_YOP_DECODER 1
%define CONFIG_YUV4_DECODER 1
%define CONFIG_ZERO12V_DECODER 1
-%define CONFIG_ZEROCODEC_DECODER 0
-%define CONFIG_ZLIB_DECODER 0
-%define CONFIG_ZMBV_DECODER 0
+%define CONFIG_ZEROCODEC_DECODER 1
+%define CONFIG_ZLIB_DECODER 1
+%define CONFIG_ZMBV_DECODER 1
%define CONFIG_AAC_DECODER 1
%define CONFIG_AAC_LATM_DECODER 1
%define CONFIG_AC3_DECODER 1
@@ -765,6 +772,7 @@
%define CONFIG_MPC8_DECODER 1
%define CONFIG_NELLYMOSER_DECODER 1
%define CONFIG_ON2AVC_DECODER 1
+%define CONFIG_OPUS_DECODER 1
%define CONFIG_PAF_AUDIO_DECODER 1
%define CONFIG_QCELP_DECODER 1
%define CONFIG_QDM2_DECODER 1
@@ -1072,6 +1080,7 @@
%define CONFIG_SEGAFILM_DEMUXER 1
%define CONFIG_SHORTEN_DEMUXER 1
%define CONFIG_SIFF_DEMUXER 1
+%define CONFIG_SLN_DEMUXER 1
%define CONFIG_SMACKER_DEMUXER 1
%define CONFIG_SMJPEG_DEMUXER 1
%define CONFIG_SMUSH_DEMUXER 1
@@ -1253,6 +1262,7 @@
%define CONFIG_MOVTEXT_ENCODER 0
%define CONFIG_SRT_ENCODER 0
%define CONFIG_SUBRIP_ENCODER 0
+%define CONFIG_WEBVTT_ENCODER 0
%define CONFIG_XSUB_ENCODER 0
%define CONFIG_LIBFAAC_ENCODER 0
%define CONFIG_LIBFDK_AAC_ENCODER 0
@@ -1459,6 +1469,7 @@
%define CONFIG_NULLSINK_FILTER 0
%define CONFIG_AVECTORSCOPE_FILTER 0
%define CONFIG_CONCAT_FILTER 0
+%define CONFIG_SHOWCQT_FILTER 0
%define CONFIG_SHOWSPECTRUM_FILTER 0
%define CONFIG_SHOWWAVES_FILTER 0
%define CONFIG_AMOVIE_FILTER 0
@@ -1468,6 +1479,7 @@
%define CONFIG_H264_DXVA2_HWACCEL 0
%define CONFIG_H264_VAAPI_HWACCEL 0
%define CONFIG_H264_VDA_HWACCEL 0
+%define CONFIG_H264_VDA_OLD_HWACCEL 0
%define CONFIG_H264_VDPAU_HWACCEL 0
%define CONFIG_MPEG1_XVMC_HWACCEL 0
%define CONFIG_MPEG1_VDPAU_HWACCEL 0
@@ -1674,6 +1686,7 @@
%define CONFIG_MPEG4VIDEO_PARSER 1
%define CONFIG_MPEGAUDIO_PARSER 1
%define CONFIG_MPEGVIDEO_PARSER 1
+%define CONFIG_OPUS_PARSER 1
%define CONFIG_PNG_PARSER 1
%define CONFIG_PNM_PARSER 1
%define CONFIG_RV30_PARSER 1
diff --git a/build/ffmpeg/config-x64.h b/build/ffmpeg/config-x64.h
index 2509930e7..7975e3f46 100644
--- a/build/ffmpeg/config-x64.h
+++ b/build/ffmpeg/config-x64.h
@@ -1,7 +1,7 @@
/* Automatically generated by configure - do not modify! */
#ifndef FFMPEG_CONFIG_H
#define FFMPEG_CONFIG_H
-#define FFMPEG_CONFIGURATION "--disable-avfilter --disable-avresample --disable-bzlib --disable-devices --disable-doc --disable-encoders --disable-ffmpeg --disable-ffplay --disable-ffprobe --disable-ffserver --disable-filters --disable-hwaccels --disable-muxers --disable-network --disable-postproc --disable-pthreads --disable-shared --disable-swresample --enable-avresample --enable-gpl --enable-runtime-cpudetect --enable-static --enable-zlib --extra-cflags=-D_SYSCRT --extra-cflags=-wd4005 --extra-cflags=-wd4189 --toolchain=msvc"
+#define FFMPEG_CONFIGURATION "--disable-avfilter --disable-avresample --disable-bzlib --disable-decoder='atrac3p,indeo2,indeo3,indeo4,indeo5,twinvq' --disable-devices --disable-doc --disable-encoders --disable-ffmpeg --disable-ffplay --disable-ffprobe --disable-ffserver --disable-filters --disable-hwaccels --disable-muxers --disable-network --disable-postproc --disable-pthreads --disable-shared --enable-gpl --enable-runtime-cpudetect --enable-static --enable-zlib --extra-cflags=-D_SYSCRT --extra-cflags=-I../../include --extra-cflags=-MD --extra-cflags=-wd4005 --extra-cflags=-wd4189 --extra-ldflags='-LIBPATH:../../lib/x64/Release' --toolchain=msvc"
#define FFMPEG_LICENSE "GPL version 2 or later"
#define CONFIG_THIS_YEAR 2014
#define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
@@ -206,12 +206,13 @@
#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
#define HAVE_LLRINT 1
#define HAVE_LLRINTF 1
-#define HAVE_LOG2 0
+#define HAVE_LOG2 1
#define HAVE_LOG2F 1
#define HAVE_LOG10F 1
#define HAVE_LRINT 1
@@ -276,6 +277,8 @@
#define HAVE_PTHREADS 0
#define HAVE_OS2THREADS 0
#define HAVE_W32THREADS 1
+#define HAVE_AS_DN_DIRECTIVE 0
+#define HAVE_AS_FUNC 1
#define HAVE_ASM_MOD_Q 0
#define HAVE_ATTRIBUTE_MAY_ALIAS 0
#define HAVE_ATTRIBUTE_PACKED 0
@@ -347,9 +350,9 @@
#define CONFIG_METADATA_EXAMPLE 1
#define CONFIG_MUXING_EXAMPLE 1
#define CONFIG_REMUXING_EXAMPLE 1
-#define CONFIG_RESAMPLING_AUDIO_EXAMPLE 0
+#define CONFIG_RESAMPLING_AUDIO_EXAMPLE 1
#define CONFIG_SCALING_VIDEO_EXAMPLE 1
-#define CONFIG_TRANSCODE_AAC_EXAMPLE 0
+#define CONFIG_TRANSCODE_AAC_EXAMPLE 1
#define CONFIG_TRANSCODING_EXAMPLE 0
#define CONFIG_AVISYNTH 0
#define CONFIG_BZLIB 0
@@ -416,7 +419,7 @@
#define CONFIG_OPENSSL 0
#define CONFIG_X11GRAB 0
#define CONFIG_XLIB 0
-#define CONFIG_ZLIB 0
+#define CONFIG_ZLIB 1
#define CONFIG_FTRAPV 0
#define CONFIG_GRAY 0
#define CONFIG_HARDCODED_TABLES 0
@@ -439,10 +442,10 @@
#define CONFIG_AVDEVICE 1
#define CONFIG_AVFILTER 0
#define CONFIG_AVFORMAT 1
-#define CONFIG_AVRESAMPLE 1
+#define CONFIG_AVRESAMPLE 0
#define CONFIG_AVUTIL 1
#define CONFIG_POSTPROC 0
-#define CONFIG_SWRESAMPLE 0
+#define CONFIG_SWRESAMPLE 1
#define CONFIG_SWSCALE 1
#define CONFIG_FFPLAY 0
#define CONFIG_FFPROBE 0
@@ -485,8 +488,11 @@
#define CONFIG_H264QPEL 1
#define CONFIG_HPELDSP 1
#define CONFIG_HUFFMAN 1
+#define CONFIG_HUFFYUVDSP 1
+#define CONFIG_HUFFYUVENCDSP 0
#define CONFIG_INTRAX8 1
#define CONFIG_LGPLV3 0
+#define CONFIG_LLAUDDSP 1
#define CONFIG_LLVIDDSP 1
#define CONFIG_LPC 0
#define CONFIG_MPEGAUDIO 1
@@ -494,6 +500,7 @@
#define CONFIG_MPEGVIDEO 1
#define CONFIG_MPEGVIDEOENC 0
#define CONFIG_NETTLE 0
+#define CONFIG_QPELDSP 1
#define CONFIG_RANGECODER 1
#define CONFIG_RIFFDEC 1
#define CONFIG_RIFFENC 0
@@ -553,7 +560,7 @@
#define CONFIG_DPX_DECODER 1
#define CONFIG_DSICINVIDEO_DECODER 1
#define CONFIG_DVVIDEO_DECODER 1
-#define CONFIG_DXA_DECODER 0
+#define CONFIG_DXA_DECODER 1
#define CONFIG_DXTORY_DECODER 1
#define CONFIG_EACMV_DECODER 1
#define CONFIG_EAMAD_DECODER 1
@@ -565,18 +572,18 @@
#define CONFIG_EIGHTSVX_FIB_DECODER 1
#define CONFIG_ESCAPE124_DECODER 1
#define CONFIG_ESCAPE130_DECODER 1
-#define CONFIG_EXR_DECODER 0
+#define CONFIG_EXR_DECODER 1
#define CONFIG_FFV1_DECODER 1
#define CONFIG_FFVHUFF_DECODER 1
#define CONFIG_FIC_DECODER 1
-#define CONFIG_FLASHSV_DECODER 0
-#define CONFIG_FLASHSV2_DECODER 0
+#define CONFIG_FLASHSV_DECODER 1
+#define CONFIG_FLASHSV2_DECODER 1
#define CONFIG_FLIC_DECODER 1
#define CONFIG_FLV_DECODER 1
#define CONFIG_FOURXM_DECODER 1
#define CONFIG_FRAPS_DECODER 1
#define CONFIG_FRWU_DECODER 1
-#define CONFIG_G2M_DECODER 0
+#define CONFIG_G2M_DECODER 1
#define CONFIG_GIF_DECODER 1
#define CONFIG_H261_DECODER 1
#define CONFIG_H263_DECODER 1
@@ -681,7 +688,7 @@
#define CONFIG_TMV_DECODER 1
#define CONFIG_TRUEMOTION1_DECODER 1
#define CONFIG_TRUEMOTION2_DECODER 1
-#define CONFIG_TSCC_DECODER 0
+#define CONFIG_TSCC_DECODER 1
#define CONFIG_TSCC2_DECODER 1
#define CONFIG_TXD_DECODER 1
#define CONFIG_ULTI_DECODER 1
@@ -727,9 +734,9 @@
#define CONFIG_YOP_DECODER 1
#define CONFIG_YUV4_DECODER 1
#define CONFIG_ZERO12V_DECODER 1
-#define CONFIG_ZEROCODEC_DECODER 0
-#define CONFIG_ZLIB_DECODER 0
-#define CONFIG_ZMBV_DECODER 0
+#define CONFIG_ZEROCODEC_DECODER 1
+#define CONFIG_ZLIB_DECODER 1
+#define CONFIG_ZMBV_DECODER 1
#define CONFIG_AAC_DECODER 1
#define CONFIG_AAC_LATM_DECODER 1
#define CONFIG_AC3_DECODER 1
@@ -780,6 +787,7 @@
#define CONFIG_MPC8_DECODER 1
#define CONFIG_NELLYMOSER_DECODER 1
#define CONFIG_ON2AVC_DECODER 1
+#define CONFIG_OPUS_DECODER 1
#define CONFIG_PAF_AUDIO_DECODER 1
#define CONFIG_QCELP_DECODER 1
#define CONFIG_QDM2_DECODER 1
@@ -1087,6 +1095,7 @@
#define CONFIG_SEGAFILM_DEMUXER 1
#define CONFIG_SHORTEN_DEMUXER 1
#define CONFIG_SIFF_DEMUXER 1
+#define CONFIG_SLN_DEMUXER 1
#define CONFIG_SMACKER_DEMUXER 1
#define CONFIG_SMJPEG_DEMUXER 1
#define CONFIG_SMUSH_DEMUXER 1
@@ -1268,6 +1277,7 @@
#define CONFIG_MOVTEXT_ENCODER 0
#define CONFIG_SRT_ENCODER 0
#define CONFIG_SUBRIP_ENCODER 0
+#define CONFIG_WEBVTT_ENCODER 0
#define CONFIG_XSUB_ENCODER 0
#define CONFIG_LIBFAAC_ENCODER 0
#define CONFIG_LIBFDK_AAC_ENCODER 0
@@ -1474,6 +1484,7 @@
#define CONFIG_NULLSINK_FILTER 0
#define CONFIG_AVECTORSCOPE_FILTER 0
#define CONFIG_CONCAT_FILTER 0
+#define CONFIG_SHOWCQT_FILTER 0
#define CONFIG_SHOWSPECTRUM_FILTER 0
#define CONFIG_SHOWWAVES_FILTER 0
#define CONFIG_AMOVIE_FILTER 0
@@ -1483,6 +1494,7 @@
#define CONFIG_H264_DXVA2_HWACCEL 0
#define CONFIG_H264_VAAPI_HWACCEL 0
#define CONFIG_H264_VDA_HWACCEL 0
+#define CONFIG_H264_VDA_OLD_HWACCEL 0
#define CONFIG_H264_VDPAU_HWACCEL 0
#define CONFIG_MPEG1_XVMC_HWACCEL 0
#define CONFIG_MPEG1_VDPAU_HWACCEL 0
@@ -1689,6 +1701,7 @@
#define CONFIG_MPEG4VIDEO_PARSER 1
#define CONFIG_MPEGAUDIO_PARSER 1
#define CONFIG_MPEGVIDEO_PARSER 1
+#define CONFIG_OPUS_PARSER 1
#define CONFIG_PNG_PARSER 1
#define CONFIG_PNM_PARSER 1
#define CONFIG_RV30_PARSER 1
diff --git a/build/ffmpeg/config-x86.asm b/build/ffmpeg/config-x86.asm
index 0c99dba51..d346370a2 100644
--- a/build/ffmpeg/config-x86.asm
+++ b/build/ffmpeg/config-x86.asm
@@ -191,12 +191,13 @@
%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
%define HAVE_LLRINT 1
%define HAVE_LLRINTF 1
-%define HAVE_LOG2 0
+%define HAVE_LOG2 1
%define HAVE_LOG2F 1
%define HAVE_LOG10F 1
%define HAVE_LRINT 1
@@ -261,6 +262,8 @@
%define HAVE_PTHREADS 0
%define HAVE_OS2THREADS 0
%define HAVE_W32THREADS 1
+%define HAVE_AS_DN_DIRECTIVE 0
+%define HAVE_AS_FUNC 1
%define HAVE_ASM_MOD_Q 0
%define HAVE_ATTRIBUTE_MAY_ALIAS 0
%define HAVE_ATTRIBUTE_PACKED 0
@@ -332,9 +335,9 @@
%define CONFIG_METADATA_EXAMPLE 1
%define CONFIG_MUXING_EXAMPLE 1
%define CONFIG_REMUXING_EXAMPLE 1
-%define CONFIG_RESAMPLING_AUDIO_EXAMPLE 0
+%define CONFIG_RESAMPLING_AUDIO_EXAMPLE 1
%define CONFIG_SCALING_VIDEO_EXAMPLE 1
-%define CONFIG_TRANSCODE_AAC_EXAMPLE 0
+%define CONFIG_TRANSCODE_AAC_EXAMPLE 1
%define CONFIG_TRANSCODING_EXAMPLE 0
%define CONFIG_AVISYNTH 0
%define CONFIG_BZLIB 0
@@ -401,7 +404,7 @@
%define CONFIG_OPENSSL 0
%define CONFIG_X11GRAB 0
%define CONFIG_XLIB 0
-%define CONFIG_ZLIB 0
+%define CONFIG_ZLIB 1
%define CONFIG_FTRAPV 0
%define CONFIG_GRAY 0
%define CONFIG_HARDCODED_TABLES 0
@@ -424,10 +427,10 @@
%define CONFIG_AVDEVICE 1
%define CONFIG_AVFILTER 0
%define CONFIG_AVFORMAT 1
-%define CONFIG_AVRESAMPLE 1
+%define CONFIG_AVRESAMPLE 0
%define CONFIG_AVUTIL 1
%define CONFIG_POSTPROC 0
-%define CONFIG_SWRESAMPLE 0
+%define CONFIG_SWRESAMPLE 1
%define CONFIG_SWSCALE 1
%define CONFIG_FFPLAY 0
%define CONFIG_FFPROBE 0
@@ -470,8 +473,11 @@
%define CONFIG_H264QPEL 1
%define CONFIG_HPELDSP 1
%define CONFIG_HUFFMAN 1
+%define CONFIG_HUFFYUVDSP 1
+%define CONFIG_HUFFYUVENCDSP 0
%define CONFIG_INTRAX8 1
%define CONFIG_LGPLV3 0
+%define CONFIG_LLAUDDSP 1
%define CONFIG_LLVIDDSP 1
%define CONFIG_LPC 0
%define CONFIG_MPEGAUDIO 1
@@ -479,6 +485,7 @@
%define CONFIG_MPEGVIDEO 1
%define CONFIG_MPEGVIDEOENC 0
%define CONFIG_NETTLE 0
+%define CONFIG_QPELDSP 1
%define CONFIG_RANGECODER 1
%define CONFIG_RIFFDEC 1
%define CONFIG_RIFFENC 0
@@ -538,7 +545,7 @@
%define CONFIG_DPX_DECODER 1
%define CONFIG_DSICINVIDEO_DECODER 1
%define CONFIG_DVVIDEO_DECODER 1
-%define CONFIG_DXA_DECODER 0
+%define CONFIG_DXA_DECODER 1
%define CONFIG_DXTORY_DECODER 1
%define CONFIG_EACMV_DECODER 1
%define CONFIG_EAMAD_DECODER 1
@@ -550,18 +557,18 @@
%define CONFIG_EIGHTSVX_FIB_DECODER 1
%define CONFIG_ESCAPE124_DECODER 1
%define CONFIG_ESCAPE130_DECODER 1
-%define CONFIG_EXR_DECODER 0
+%define CONFIG_EXR_DECODER 1
%define CONFIG_FFV1_DECODER 1
%define CONFIG_FFVHUFF_DECODER 1
%define CONFIG_FIC_DECODER 1
-%define CONFIG_FLASHSV_DECODER 0
-%define CONFIG_FLASHSV2_DECODER 0
+%define CONFIG_FLASHSV_DECODER 1
+%define CONFIG_FLASHSV2_DECODER 1
%define CONFIG_FLIC_DECODER 1
%define CONFIG_FLV_DECODER 1
%define CONFIG_FOURXM_DECODER 1
%define CONFIG_FRAPS_DECODER 1
%define CONFIG_FRWU_DECODER 1
-%define CONFIG_G2M_DECODER 0
+%define CONFIG_G2M_DECODER 1
%define CONFIG_GIF_DECODER 1
%define CONFIG_H261_DECODER 1
%define CONFIG_H263_DECODER 1
@@ -666,7 +673,7 @@
%define CONFIG_TMV_DECODER 1
%define CONFIG_TRUEMOTION1_DECODER 1
%define CONFIG_TRUEMOTION2_DECODER 1
-%define CONFIG_TSCC_DECODER 0
+%define CONFIG_TSCC_DECODER 1
%define CONFIG_TSCC2_DECODER 1
%define CONFIG_TXD_DECODER 1
%define CONFIG_ULTI_DECODER 1
@@ -712,9 +719,9 @@
%define CONFIG_YOP_DECODER 1
%define CONFIG_YUV4_DECODER 1
%define CONFIG_ZERO12V_DECODER 1
-%define CONFIG_ZEROCODEC_DECODER 0
-%define CONFIG_ZLIB_DECODER 0
-%define CONFIG_ZMBV_DECODER 0
+%define CONFIG_ZEROCODEC_DECODER 1
+%define CONFIG_ZLIB_DECODER 1
+%define CONFIG_ZMBV_DECODER 1
%define CONFIG_AAC_DECODER 1
%define CONFIG_AAC_LATM_DECODER 1
%define CONFIG_AC3_DECODER 1
@@ -765,6 +772,7 @@
%define CONFIG_MPC8_DECODER 1
%define CONFIG_NELLYMOSER_DECODER 1
%define CONFIG_ON2AVC_DECODER 1
+%define CONFIG_OPUS_DECODER 1
%define CONFIG_PAF_AUDIO_DECODER 1
%define CONFIG_QCELP_DECODER 1
%define CONFIG_QDM2_DECODER 1
@@ -1072,6 +1080,7 @@
%define CONFIG_SEGAFILM_DEMUXER 1
%define CONFIG_SHORTEN_DEMUXER 1
%define CONFIG_SIFF_DEMUXER 1
+%define CONFIG_SLN_DEMUXER 1
%define CONFIG_SMACKER_DEMUXER 1
%define CONFIG_SMJPEG_DEMUXER 1
%define CONFIG_SMUSH_DEMUXER 1
@@ -1253,6 +1262,7 @@
%define CONFIG_MOVTEXT_ENCODER 0
%define CONFIG_SRT_ENCODER 0
%define CONFIG_SUBRIP_ENCODER 0
+%define CONFIG_WEBVTT_ENCODER 0
%define CONFIG_XSUB_ENCODER 0
%define CONFIG_LIBFAAC_ENCODER 0
%define CONFIG_LIBFDK_AAC_ENCODER 0
@@ -1459,6 +1469,7 @@
%define CONFIG_NULLSINK_FILTER 0
%define CONFIG_AVECTORSCOPE_FILTER 0
%define CONFIG_CONCAT_FILTER 0
+%define CONFIG_SHOWCQT_FILTER 0
%define CONFIG_SHOWSPECTRUM_FILTER 0
%define CONFIG_SHOWWAVES_FILTER 0
%define CONFIG_AMOVIE_FILTER 0
@@ -1468,6 +1479,7 @@
%define CONFIG_H264_DXVA2_HWACCEL 0
%define CONFIG_H264_VAAPI_HWACCEL 0
%define CONFIG_H264_VDA_HWACCEL 0
+%define CONFIG_H264_VDA_OLD_HWACCEL 0
%define CONFIG_H264_VDPAU_HWACCEL 0
%define CONFIG_MPEG1_XVMC_HWACCEL 0
%define CONFIG_MPEG1_VDPAU_HWACCEL 0
@@ -1674,6 +1686,7 @@
%define CONFIG_MPEG4VIDEO_PARSER 1
%define CONFIG_MPEGAUDIO_PARSER 1
%define CONFIG_MPEGVIDEO_PARSER 1
+%define CONFIG_OPUS_PARSER 1
%define CONFIG_PNG_PARSER 1
%define CONFIG_PNM_PARSER 1
%define CONFIG_RV30_PARSER 1
diff --git a/build/ffmpeg/config-x86.h b/build/ffmpeg/config-x86.h
index da6b028cc..4f62c2e5d 100644
--- a/build/ffmpeg/config-x86.h
+++ b/build/ffmpeg/config-x86.h
@@ -1,7 +1,7 @@
/* Automatically generated by configure - do not modify! */
#ifndef FFMPEG_CONFIG_H
#define FFMPEG_CONFIG_H
-#define FFMPEG_CONFIGURATION "--disable-avfilter --disable-avresample --disable-bzlib --disable-devices --disable-doc --disable-encoders --disable-ffmpeg --disable-ffplay --disable-ffprobe --disable-ffserver --disable-filters --disable-hwaccels --disable-muxers --disable-network --disable-postproc --disable-pthreads --disable-shared --disable-swresample --enable-avresample --enable-gpl --enable-runtime-cpudetect --enable-static --enable-zlib --extra-cflags=-D_SYSCRT --extra-cflags=-wd4005 --extra-cflags=-wd4189 --toolchain=msvc"
+#define FFMPEG_CONFIGURATION "--disable-avfilter --disable-avresample --disable-bzlib --disable-decoder='atrac3p,indeo2,indeo3,indeo4,indeo5,twinvq' --disable-devices --disable-doc --disable-encoders --disable-ffmpeg --disable-ffplay --disable-ffprobe --disable-ffserver --disable-filters --disable-hwaccels --disable-muxers --disable-network --disable-postproc --disable-pthreads --disable-shared --enable-gpl --enable-runtime-cpudetect --enable-static --enable-zlib --extra-cflags=-D_SYSCRT --extra-cflags=-I../../include --extra-cflags=-MD --extra-cflags=-wd4005 --extra-cflags=-wd4189 --extra-ldflags='-LIBPATH:../../lib/Win32/Release' --toolchain=msvc"
#define FFMPEG_LICENSE "GPL version 2 or later"
#define CONFIG_THIS_YEAR 2014
#define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
@@ -206,12 +206,13 @@
#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
#define HAVE_LLRINT 1
#define HAVE_LLRINTF 1
-#define HAVE_LOG2 0
+#define HAVE_LOG2 1
#define HAVE_LOG2F 1
#define HAVE_LOG10F 1
#define HAVE_LRINT 1
@@ -276,6 +277,8 @@
#define HAVE_PTHREADS 0
#define HAVE_OS2THREADS 0
#define HAVE_W32THREADS 1
+#define HAVE_AS_DN_DIRECTIVE 0
+#define HAVE_AS_FUNC 1
#define HAVE_ASM_MOD_Q 0
#define HAVE_ATTRIBUTE_MAY_ALIAS 0
#define HAVE_ATTRIBUTE_PACKED 0
@@ -347,9 +350,9 @@
#define CONFIG_METADATA_EXAMPLE 1
#define CONFIG_MUXING_EXAMPLE 1
#define CONFIG_REMUXING_EXAMPLE 1
-#define CONFIG_RESAMPLING_AUDIO_EXAMPLE 0
+#define CONFIG_RESAMPLING_AUDIO_EXAMPLE 1
#define CONFIG_SCALING_VIDEO_EXAMPLE 1
-#define CONFIG_TRANSCODE_AAC_EXAMPLE 0
+#define CONFIG_TRANSCODE_AAC_EXAMPLE 1
#define CONFIG_TRANSCODING_EXAMPLE 0
#define CONFIG_AVISYNTH 0
#define CONFIG_BZLIB 0
@@ -416,7 +419,7 @@
#define CONFIG_OPENSSL 0
#define CONFIG_X11GRAB 0
#define CONFIG_XLIB 0
-#define CONFIG_ZLIB 0
+#define CONFIG_ZLIB 1
#define CONFIG_FTRAPV 0
#define CONFIG_GRAY 0
#define CONFIG_HARDCODED_TABLES 0
@@ -439,10 +442,10 @@
#define CONFIG_AVDEVICE 1
#define CONFIG_AVFILTER 0
#define CONFIG_AVFORMAT 1
-#define CONFIG_AVRESAMPLE 1
+#define CONFIG_AVRESAMPLE 0
#define CONFIG_AVUTIL 1
#define CONFIG_POSTPROC 0
-#define CONFIG_SWRESAMPLE 0
+#define CONFIG_SWRESAMPLE 1
#define CONFIG_SWSCALE 1
#define CONFIG_FFPLAY 0
#define CONFIG_FFPROBE 0
@@ -485,8 +488,11 @@
#define CONFIG_H264QPEL 1
#define CONFIG_HPELDSP 1
#define CONFIG_HUFFMAN 1
+#define CONFIG_HUFFYUVDSP 1
+#define CONFIG_HUFFYUVENCDSP 0
#define CONFIG_INTRAX8 1
#define CONFIG_LGPLV3 0
+#define CONFIG_LLAUDDSP 1
#define CONFIG_LLVIDDSP 1
#define CONFIG_LPC 0
#define CONFIG_MPEGAUDIO 1
@@ -494,6 +500,7 @@
#define CONFIG_MPEGVIDEO 1
#define CONFIG_MPEGVIDEOENC 0
#define CONFIG_NETTLE 0
+#define CONFIG_QPELDSP 1
#define CONFIG_RANGECODER 1
#define CONFIG_RIFFDEC 1
#define CONFIG_RIFFENC 0
@@ -553,7 +560,7 @@
#define CONFIG_DPX_DECODER 1
#define CONFIG_DSICINVIDEO_DECODER 1
#define CONFIG_DVVIDEO_DECODER 1
-#define CONFIG_DXA_DECODER 0
+#define CONFIG_DXA_DECODER 1
#define CONFIG_DXTORY_DECODER 1
#define CONFIG_EACMV_DECODER 1
#define CONFIG_EAMAD_DECODER 1
@@ -565,18 +572,18 @@
#define CONFIG_EIGHTSVX_FIB_DECODER 1
#define CONFIG_ESCAPE124_DECODER 1
#define CONFIG_ESCAPE130_DECODER 1
-#define CONFIG_EXR_DECODER 0
+#define CONFIG_EXR_DECODER 1
#define CONFIG_FFV1_DECODER 1
#define CONFIG_FFVHUFF_DECODER 1
#define CONFIG_FIC_DECODER 1
-#define CONFIG_FLASHSV_DECODER 0
-#define CONFIG_FLASHSV2_DECODER 0
+#define CONFIG_FLASHSV_DECODER 1
+#define CONFIG_FLASHSV2_DECODER 1
#define CONFIG_FLIC_DECODER 1
#define CONFIG_FLV_DECODER 1
#define CONFIG_FOURXM_DECODER 1
#define CONFIG_FRAPS_DECODER 1
#define CONFIG_FRWU_DECODER 1
-#define CONFIG_G2M_DECODER 0
+#define CONFIG_G2M_DECODER 1
#define CONFIG_GIF_DECODER 1
#define CONFIG_H261_DECODER 1
#define CONFIG_H263_DECODER 1
@@ -681,7 +688,7 @@
#define CONFIG_TMV_DECODER 1
#define CONFIG_TRUEMOTION1_DECODER 1
#define CONFIG_TRUEMOTION2_DECODER 1
-#define CONFIG_TSCC_DECODER 0
+#define CONFIG_TSCC_DECODER 1
#define CONFIG_TSCC2_DECODER 1
#define CONFIG_TXD_DECODER 1
#define CONFIG_ULTI_DECODER 1
@@ -727,9 +734,9 @@
#define CONFIG_YOP_DECODER 1
#define CONFIG_YUV4_DECODER 1
#define CONFIG_ZERO12V_DECODER 1
-#define CONFIG_ZEROCODEC_DECODER 0
-#define CONFIG_ZLIB_DECODER 0
-#define CONFIG_ZMBV_DECODER 0
+#define CONFIG_ZEROCODEC_DECODER 1
+#define CONFIG_ZLIB_DECODER 1
+#define CONFIG_ZMBV_DECODER 1
#define CONFIG_AAC_DECODER 1
#define CONFIG_AAC_LATM_DECODER 1
#define CONFIG_AC3_DECODER 1
@@ -780,6 +787,7 @@
#define CONFIG_MPC8_DECODER 1
#define CONFIG_NELLYMOSER_DECODER 1
#define CONFIG_ON2AVC_DECODER 1
+#define CONFIG_OPUS_DECODER 1
#define CONFIG_PAF_AUDIO_DECODER 1
#define CONFIG_QCELP_DECODER 1
#define CONFIG_QDM2_DECODER 1
@@ -1087,6 +1095,7 @@
#define CONFIG_SEGAFILM_DEMUXER 1
#define CONFIG_SHORTEN_DEMUXER 1
#define CONFIG_SIFF_DEMUXER 1
+#define CONFIG_SLN_DEMUXER 1
#define CONFIG_SMACKER_DEMUXER 1
#define CONFIG_SMJPEG_DEMUXER 1
#define CONFIG_SMUSH_DEMUXER 1
@@ -1268,6 +1277,7 @@
#define CONFIG_MOVTEXT_ENCODER 0
#define CONFIG_SRT_ENCODER 0
#define CONFIG_SUBRIP_ENCODER 0
+#define CONFIG_WEBVTT_ENCODER 0
#define CONFIG_XSUB_ENCODER 0
#define CONFIG_LIBFAAC_ENCODER 0
#define CONFIG_LIBFDK_AAC_ENCODER 0
@@ -1474,6 +1484,7 @@
#define CONFIG_NULLSINK_FILTER 0
#define CONFIG_AVECTORSCOPE_FILTER 0
#define CONFIG_CONCAT_FILTER 0
+#define CONFIG_SHOWCQT_FILTER 0
#define CONFIG_SHOWSPECTRUM_FILTER 0
#define CONFIG_SHOWWAVES_FILTER 0
#define CONFIG_AMOVIE_FILTER 0
@@ -1483,6 +1494,7 @@
#define CONFIG_H264_DXVA2_HWACCEL 0
#define CONFIG_H264_VAAPI_HWACCEL 0
#define CONFIG_H264_VDA_HWACCEL 0
+#define CONFIG_H264_VDA_OLD_HWACCEL 0
#define CONFIG_H264_VDPAU_HWACCEL 0
#define CONFIG_MPEG1_XVMC_HWACCEL 0
#define CONFIG_MPEG1_VDPAU_HWACCEL 0
@@ -1689,6 +1701,7 @@
#define CONFIG_MPEG4VIDEO_PARSER 1
#define CONFIG_MPEGAUDIO_PARSER 1
#define CONFIG_MPEGVIDEO_PARSER 1
+#define CONFIG_OPUS_PARSER 1
#define CONFIG_PNG_PARSER 1
#define CONFIG_PNM_PARSER 1
#define CONFIG_RV30_PARSER 1
diff --git a/build/ffmpeg/configure.sh b/build/ffmpeg/configure.sh
index 15949fdd6..7824407a2 100755
--- a/build/ffmpeg/configure.sh
+++ b/build/ffmpeg/configure.sh
@@ -1 +1,40 @@
-./configure $@ --disable-avfilter --disable-avresample --disable-bzlib --disable-devices --disable-doc --disable-encoders --disable-ffmpeg --disable-ffplay --disable-ffprobe --disable-ffserver --disable-filters --disable-hwaccels --disable-muxers --disable-network --disable-postproc --disable-pthreads --disable-shared --disable-swresample --enable-avresample --enable-gpl --enable-runtime-cpudetect --enable-static --enable-zlib --extra-cflags=-D_SYSCRT --extra-cflags=-wd4005 --extra-cflags=-wd4189 --toolchain=msvc
+platform='Win32'
+suffix='x86'
+if [[ $LIB =~ amd64 ]]; then
+ platform='x64'
+ suffix='x64'
+fi
+
+./configure $@ \
+ --disable-avfilter \
+ --disable-avresample \
+ --disable-bzlib \
+ --disable-decoder=atrac3p,indeo2,indeo3,indeo4,indeo5,twinvq \
+ --disable-devices \
+ --disable-doc \
+ --disable-encoders \
+ --disable-ffmpeg \
+ --disable-ffplay \
+ --disable-ffprobe \
+ --disable-ffserver \
+ --disable-filters \
+ --disable-hwaccels \
+ --disable-muxers \
+ --disable-network \
+ --disable-postproc \
+ --disable-pthreads \
+ --disable-shared \
+ --enable-gpl \
+ --enable-runtime-cpudetect \
+ --enable-static \
+ --enable-zlib \
+ --extra-cflags=-D_SYSCRT \
+ --extra-cflags=-I../../include \
+ --extra-cflags=-MD \
+ --extra-cflags=-wd4005 \
+ --extra-cflags=-wd4189 \
+ --extra-ldflags=-LIBPATH:../../lib/$platform/Release \
+ --toolchain=msvc
+
+mv config.h ../../build/ffmpeg/config-$suffix.h
+mv config.asm ../../build/ffmpeg/config-$suffix.asm
diff --git a/build/ffmpeg/ffmpeg.vcxproj b/build/ffmpeg/ffmpeg.vcxproj
index 293d8a273..724fad13f 100644
--- a/build/ffmpeg/ffmpeg.vcxproj
+++ b/build/ffmpeg/ffmpeg.vcxproj
@@ -87,6 +87,570 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -329,7 +893,7 @@
-
+
@@ -338,574 +902,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
@@ -920,6 +919,7 @@
+
@@ -955,15 +955,34 @@
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1047,9 +1066,6 @@
-
-
-
@@ -1074,14 +1090,17 @@
+
+
+
-
+
@@ -1098,12 +1117,17 @@
-
-
-
+
+
+
+
+
+
+
+
diff --git a/vendor/ffmpeg b/vendor/ffmpeg
index 398e3a591..049b20b28 160000
--- a/vendor/ffmpeg
+++ b/vendor/ffmpeg
@@ -1 +1 @@
-Subproject commit 398e3a591fb8739a5af72f802153700fefa92098
+Subproject commit 049b20b287397b68804649673da32043d3908b77
diff --git a/vendor/ffms2 b/vendor/ffms2
index ead726b79..9203af5f2 160000
--- a/vendor/ffms2
+++ b/vendor/ffms2
@@ -1 +1 @@
-Subproject commit ead726b7964edaf7dc725c68c41ce00a82eb3d27
+Subproject commit 9203af5f2d0721d3f377d50939d6d8592b331bdb
diff --git a/vendor/libass b/vendor/libass
index af6c1d42c..042a22af3 160000
--- a/vendor/libass
+++ b/vendor/libass
@@ -1 +1 @@
-Subproject commit af6c1d42c5a76a89697ecfddbba73102a28d3e1e
+Subproject commit 042a22af3cb47a3320083a6b3ca8dbd8e255678d