diff --git a/SMP/config.asm b/SMP/config.asm
index 9d4a4ae144b25..f61121d5b6311 100644
--- a/SMP/config.asm
+++ b/SMP/config.asm
@@ -405,8 +405,6 @@
 %define HAVE_DXVA2_LIB 1
 %define HAVE_DXVA2API_COBJ 1
 %define HAVE_LIBC_MSVCRT 1
-%define HAVE_LIBDC1394_1 0
-%define HAVE_LIBDC1394_2 0
 %define HAVE_MAKEINFO 0
 %define HAVE_MAKEINFO_HTML 0
 %define HAVE_MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS 0
@@ -420,18 +418,6 @@
 %define HAVE_VAAPI_X11 0
 %define HAVE_VDPAU_X11 0
 %define HAVE_WINRT 0
-%define HAVE_XLIB 0
-%define CONFIG_BSFS 1
-%define CONFIG_DECODERS 1
-%define CONFIG_ENCODERS 1
-%define CONFIG_HWACCELS 1
-%define CONFIG_PARSERS 1
-%define CONFIG_INDEVS 1
-%define CONFIG_OUTDEVS 1
-%define CONFIG_FILTERS 1
-%define CONFIG_DEMUXERS 1
-%define CONFIG_MUXERS 1
-%define CONFIG_PROTOCOLS 1
 %define CONFIG_DOC 0
 %define CONFIG_HTMLPAGES 0
 %define CONFIG_MANPAGES 0
@@ -603,6 +589,17 @@
 %define CONFIG_THUMB 0
 %define CONFIG_VALGRIND_BACKTRACE 0
 %define CONFIG_XMM_CLOBBER_TEST 0
+%define CONFIG_BSFS 1
+%define CONFIG_DECODERS 1
+%define CONFIG_ENCODERS 1
+%define CONFIG_HWACCELS 1
+%define CONFIG_PARSERS 1
+%define CONFIG_INDEVS 1
+%define CONFIG_OUTDEVS 1
+%define CONFIG_FILTERS 1
+%define CONFIG_DEMUXERS 1
+%define CONFIG_MUXERS 1
+%define CONFIG_PROTOCOLS 1
 %define CONFIG_AANDCTTABLES 1
 %define CONFIG_AC3DSP 1
 %define CONFIG_AUDIO_FRAME_QUEUE 1
@@ -628,6 +625,7 @@
 %define CONFIG_H264PARSE 1
 %define CONFIG_H264PRED 1
 %define CONFIG_H264QPEL 1
+%define CONFIG_HEVCPARSE 1
 %define CONFIG_HPELDSP 1
 %define CONFIG_HUFFMAN 1
 %define CONFIG_HUFFYUVDSP 1
@@ -650,6 +648,7 @@
 %define CONFIG_MPEG_ER 1
 %define CONFIG_MPEGAUDIO 1
 %define CONFIG_MPEGAUDIODSP 1
+%define CONFIG_MPEGAUDIOHEADER 1
 %define CONFIG_MPEGVIDEO 1
 %define CONFIG_MPEGVIDEOENC 1
 %define CONFIG_MSS34DSP 1
@@ -921,6 +920,7 @@
 %define CONFIG_VP8_DECODER 1
 %define CONFIG_VP9_DECODER 1
 %define CONFIG_VQA_DECODER 1
+%define CONFIG_BITPACKED_DECODER 1
 %define CONFIG_WEBP_DECODER 1
 %define CONFIG_WMV1_DECODER 1
 %define CONFIG_WMV2_DECODER 1
diff --git a/SMP/config.h b/SMP/config.h
index 85d10c7d17c9f..636bfb928db56 100644
--- a/SMP/config.h
+++ b/SMP/config.h
@@ -447,8 +447,6 @@
 #define HAVE_DXVA2_LIB 1
 #define HAVE_DXVA2API_COBJ 1
 #define HAVE_LIBC_MSVCRT 1
-#define HAVE_LIBDC1394_1 0
-#define HAVE_LIBDC1394_2 0
 #define HAVE_MAKEINFO 0
 #define HAVE_MAKEINFO_HTML 0
 #define HAVE_MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS 0
@@ -462,18 +460,6 @@
 #define HAVE_VAAPI_X11 0
 #define HAVE_VDPAU_X11 0
 #define HAVE_WINRT 0
-#define HAVE_XLIB 0
-#define CONFIG_BSFS 1
-#define CONFIG_DECODERS 1
-#define CONFIG_ENCODERS 1
-#define CONFIG_HWACCELS 1
-#define CONFIG_PARSERS 1
-#define CONFIG_INDEVS 1
-#define CONFIG_OUTDEVS 1
-#define CONFIG_FILTERS 1
-#define CONFIG_DEMUXERS 1
-#define CONFIG_MUXERS 1
-#define CONFIG_PROTOCOLS 1
 #define CONFIG_DOC 0
 #define CONFIG_HTMLPAGES 0
 #define CONFIG_MANPAGES 0
@@ -658,6 +644,17 @@
 #define CONFIG_THUMB 0
 #define CONFIG_VALGRIND_BACKTRACE 0
 #define CONFIG_XMM_CLOBBER_TEST 0
+#define CONFIG_BSFS 1
+#define CONFIG_DECODERS 1
+#define CONFIG_ENCODERS 1
+#define CONFIG_HWACCELS 1
+#define CONFIG_PARSERS 1
+#define CONFIG_INDEVS 1
+#define CONFIG_OUTDEVS 1
+#define CONFIG_FILTERS 1
+#define CONFIG_DEMUXERS 1
+#define CONFIG_MUXERS 1
+#define CONFIG_PROTOCOLS 1
 #define CONFIG_AANDCTTABLES 1
 #define CONFIG_AC3DSP 1
 #define CONFIG_AUDIO_FRAME_QUEUE 1
@@ -683,6 +680,7 @@
 #define CONFIG_H264PARSE 1
 #define CONFIG_H264PRED 1
 #define CONFIG_H264QPEL 1
+#define CONFIG_HEVCPARSE 1
 #define CONFIG_HPELDSP 1
 #define CONFIG_HUFFMAN 1
 #define CONFIG_HUFFYUVDSP 1
@@ -705,6 +703,7 @@
 #define CONFIG_MPEG_ER 1
 #define CONFIG_MPEGAUDIO 1
 #define CONFIG_MPEGAUDIODSP 1
+#define CONFIG_MPEGAUDIOHEADER 1
 #define CONFIG_MPEGVIDEO 1
 #define CONFIG_MPEGVIDEOENC 1
 #define CONFIG_MSS34DSP 1
@@ -976,6 +975,7 @@
 #define CONFIG_VP8_DECODER 1
 #define CONFIG_VP9_DECODER 1
 #define CONFIG_VQA_DECODER 1
+#define CONFIG_BITPACKED_DECODER 1
 #define CONFIG_WEBP_DECODER 1
 #define CONFIG_WMV1_DECODER 1
 #define CONFIG_WMV2_DECODER 1
diff --git a/SMP/libavcodec.vcxproj b/SMP/libavcodec.vcxproj
index d967815653a44..d0dd7c6cd8aac 100644
--- a/SMP/libavcodec.vcxproj
+++ b/SMP/libavcodec.vcxproj
@@ -118,6 +118,7 @@
     <YASM Include="..\libavcodec\x86\g722dsp.asm" />
     <YASM Include="..\libavcodec\x86\alacdsp.asm" />
     <YASM Include="..\libavcodec\x86\pngdsp.asm" />
+    <YASM Include="..\libavcodec\x86\cavsidct.asm" />
     <YASM Include="..\libavcodec\x86\dcadsp.asm" />
     <YASM Include="..\libavcodec\x86\synth_filter.asm" />
     <YASM Include="..\libavcodec\x86\diracdsp.asm" />
@@ -166,8 +167,10 @@
     <ClCompile Include="..\libavcodec\bsf.c" />
     <ClCompile Include="..\libavcodec\codec_desc.c" />
     <ClCompile Include="..\libavcodec\d3d11va.c" />
+    <ClCompile Include="..\libavcodec\decode.c" />
     <ClCompile Include="..\libavcodec\dirac.c" />
     <ClCompile Include="..\libavcodec\dv_profile.c" />
+    <ClCompile Include="..\libavcodec\encode.c" />
     <ClCompile Include="..\libavcodec\imgconvert.c" />
     <ClCompile Include="..\libavcodec\jni.c" />
     <ClCompile Include="..\libavcodec\mathtables.c" />
@@ -213,6 +216,8 @@
     <ClCompile Include="..\libavcodec\h264_ps.c" />
     <ClCompile Include="..\libavcodec\h264pred.c" />
     <ClCompile Include="..\libavcodec\h264qpel.c" />
+    <ClCompile Include="..\libavcodec\hevc_parse.c" />
+    <ClCompile Include="..\libavcodec\hevc_ps.c" />
     <ClCompile Include="..\libavcodec\huffman.c" />
     <ClCompile Include="..\libavcodec\simple_idct.c" />
     <ClCompile Include="..\libavcodec\jrevdct.c" />
@@ -231,12 +236,12 @@
     <ClCompile Include="..\libavcodec\mdct_fixed_32.c" />
     <ClCompile Include="..\libavcodec\mpeg_er.c" />
     <ClCompile Include="..\libavcodec\mpegaudio.c" />
-    <ClCompile Include="..\libavcodec\mpegaudiodata.c" />
-    <ClCompile Include="..\libavcodec\mpegaudiodecheader.c" />
     <ClCompile Include="..\libavcodec\mpegaudiodsp.c" />
     <ClCompile Include="..\libavcodec\mpegaudiodsp_data.c" />
     <ClCompile Include="..\libavcodec\mpegaudiodsp_fixed.c" />
     <ClCompile Include="..\libavcodec\mpegaudiodsp_float.c" />
+    <ClCompile Include="..\libavcodec\mpegaudiodecheader.c" />
+    <ClCompile Include="..\libavcodec\mpegaudiodata.c" />
     <ClCompile Include="..\libavcodec\mpegvideo.c" />
     <ClCompile Include="..\libavcodec\mpegvideodsp.c" />
     <ClCompile Include="..\libavcodec\rl.c" />
@@ -357,6 +362,7 @@
     <ClCompile Include="..\libavcodec\binkdsp.c" />
     <ClCompile Include="..\libavcodec\binkaudio.c" />
     <ClCompile Include="..\libavcodec\bintext.c" />
+    <ClCompile Include="..\libavcodec\bitpacked.c" />
     <ClCompile Include="..\libavcodec\bmp.c" />
     <ClCompile Include="..\libavcodec\bmpenc.c" />
     <ClCompile Include="..\libavcodec\bmvaudio.c" />
@@ -503,7 +509,6 @@
     <ClCompile Include="..\libavcodec\hap.c" />
     <ClCompile Include="..\libavcodec\hevcdec.c" />
     <ClCompile Include="..\libavcodec\hevc_mvs.c" />
-    <ClCompile Include="..\libavcodec\hevc_ps.c" />
     <ClCompile Include="..\libavcodec\hevc_sei.c" />
     <ClCompile Include="..\libavcodec\hevc_cabac.c" />
     <ClCompile Include="..\libavcodec\hevc_refs.c" />
diff --git a/SMP/libavcodec.vcxproj.filters b/SMP/libavcodec.vcxproj.filters
index 312bcb2415600..f68c393618669 100644
--- a/SMP/libavcodec.vcxproj.filters
+++ b/SMP/libavcodec.vcxproj.filters
@@ -181,6 +181,9 @@
     <YASM Include="..\libavcodec\x86\pngdsp.asm">
       <Filter>Source Files\libavcodec\x86</Filter>
     </YASM>
+    <YASM Include="..\libavcodec\x86\cavsidct.asm">
+      <Filter>Source Files\libavcodec\x86</Filter>
+    </YASM>
     <YASM Include="..\libavcodec\x86\dcadsp.asm">
       <Filter>Source Files\libavcodec\x86</Filter>
     </YASM>
@@ -321,12 +324,18 @@
     <ClCompile Include="..\libavcodec\d3d11va.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\decode.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\dirac.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
     <ClCompile Include="..\libavcodec\dv_profile.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\encode.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\imgconvert.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -462,6 +471,12 @@
     <ClCompile Include="..\libavcodec\h264qpel.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\hevc_parse.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavcodec\hevc_ps.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\huffman.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -516,12 +531,6 @@
     <ClCompile Include="..\libavcodec\mpegaudio.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\mpegaudiodata.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
-    <ClCompile Include="..\libavcodec\mpegaudiodecheader.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavcodec\mpegaudiodsp.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -534,6 +543,12 @@
     <ClCompile Include="..\libavcodec\mpegaudiodsp_float.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\mpegaudiodecheader.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavcodec\mpegaudiodata.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\mpegvideo.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -894,6 +909,9 @@
     <ClCompile Include="..\libavcodec\bintext.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\bitpacked.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\bmp.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -1332,9 +1350,6 @@
     <ClCompile Include="..\libavcodec\hevc_mvs.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\hevc_ps.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavcodec\hevc_sei.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
diff --git a/SMP/libavcodec/dce_defs.c b/SMP/libavcodec/dce_defs.c
index cd8fc8caeee0c..ac7539be0cde7 100644
--- a/SMP/libavcodec/dce_defs.c
+++ b/SMP/libavcodec/dce_defs.c
@@ -3538,12 +3538,18 @@ void ff_simple_idct12_sse2(int16_t *block) {return;}
 #if !(HAVE_MMX_INLINE)
 void ff_simple_idct_add_mmx(uint8_t *dest, ptrdiff_t line_size, int16_t *block) {return;}
 #endif
+#if !(HAVE_SSE2_INLINE)
+void ff_simple_idct_add_sse2(uint8_t *dest, ptrdiff_t line_size, int16_t *block) {return;}
+#endif
 #if !(HAVE_MMX_INLINE)
 void ff_simple_idct_mmx(int16_t *block) {return;}
 #endif
 #if !(HAVE_MMX_INLINE)
 void ff_simple_idct_put_mmx(uint8_t *dest, ptrdiff_t line_size, int16_t *block) {return;}
 #endif
+#if !(HAVE_SSE2_INLINE)
+void ff_simple_idct_put_sse2(uint8_t *dest, ptrdiff_t line_size, int16_t *block) {return;}
+#endif
 void ff_svq1enc_init_ppc(SVQ1EncContext *c) {return;}
 void ff_synth_filter_init_aarch64(SynthFilterContext *c) {return;}
 void ff_synth_filter_init_arm(SynthFilterContext *c) {return;}
diff --git a/SMP/libavformat.vcxproj b/SMP/libavformat.vcxproj
index 9ed042c21746c..3ddb2af3b2292 100644
--- a/SMP/libavformat.vcxproj
+++ b/SMP/libavformat.vcxproj
@@ -115,6 +115,7 @@
     <ClCompile Include="..\libavformat\rtpdec_qcelp.c" />
     <ClCompile Include="..\libavformat\rtpdec_qdm2.c" />
     <ClCompile Include="..\libavformat\rtpdec_qt.c" />
+    <ClCompile Include="..\libavformat\rtpdec_rfc4175.c" />
     <ClCompile Include="..\libavformat\rtpdec_svq3.c" />
     <ClCompile Include="..\libavformat\rtpdec_vc2hq.c" />
     <ClCompile Include="..\libavformat\rtpdec_vp8.c" />
diff --git a/SMP/libavformat.vcxproj.filters b/SMP/libavformat.vcxproj.filters
index d12cdd2319bbe..a6167c43a9619 100644
--- a/SMP/libavformat.vcxproj.filters
+++ b/SMP/libavformat.vcxproj.filters
@@ -169,6 +169,9 @@
     <ClCompile Include="..\libavformat\rtpdec_qt.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\rtpdec_rfc4175.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\rtpdec_svq3.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
diff --git a/SMP/libavutil.def b/SMP/libavutil.def
index d43c3f7c2d876..b7ed4dfe2f56d 100644
--- a/SMP/libavutil.def
+++ b/SMP/libavutil.def
@@ -79,6 +79,8 @@ EXPORTS
     av_color_transfer_name
     av_compare_mod
     av_compare_ts
+    av_content_light_metadata_alloc
+    av_content_light_metadata_create_side_data
     av_cpu_count
     av_crc
     av_crc_get_table