diff --git a/SMP/config.asm b/SMP/config.asm
index 2716aef4aaca3964030986f24a7730edf8954666..7e1f73b5f0e5ce1a01fc4048865f6c43956bac18 100644
--- a/SMP/config.asm
+++ b/SMP/config.asm
@@ -1155,9 +1155,12 @@
 %define CONFIG_MPEG1_CUVID_DECODER 0
 %define CONFIG_MPEG2_CUVID_DECODER 0
 %define CONFIG_MPEG4_CUVID_DECODER 0
+%define CONFIG_MPEG4_MEDIACODEC_DECODER 0
 %define CONFIG_VC1_CUVID_DECODER 0
 %define CONFIG_VP8_CUVID_DECODER 0
+%define CONFIG_VP8_MEDIACODEC_DECODER 0
 %define CONFIG_VP9_CUVID_DECODER 0
+%define CONFIG_VP9_MEDIACODEC_DECODER 0
 %define CONFIG_AA_DEMUXER 1
 %define CONFIG_AAC_DEMUXER 1
 %define CONFIG_AC3_DEMUXER 1
@@ -1964,6 +1967,7 @@
 %define CONFIG_MPEG2_VDPAU_HWACCEL 0
 %define CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL 0
 %define CONFIG_MPEG4_CUVID_HWACCEL 0
+%define CONFIG_MPEG4_MEDIACODEC_HWACCEL 0
 %define CONFIG_MPEG4_MMAL_HWACCEL 0
 %define CONFIG_MPEG4_VAAPI_HWACCEL 0
 %define CONFIG_MPEG4_VDPAU_HWACCEL 0
@@ -1976,9 +1980,11 @@
 %define CONFIG_VC1_MMAL_HWACCEL 0
 %define CONFIG_VC1_QSV_HWACCEL 1
 %define CONFIG_VP8_CUVID_HWACCEL 0
+%define CONFIG_VP8_MEDIACODEC_HWACCEL 0
 %define CONFIG_VP9_CUVID_HWACCEL 0
 %define CONFIG_VP9_D3D11VA_HWACCEL 1
 %define CONFIG_VP9_DXVA2_HWACCEL 1
+%define CONFIG_VP9_MEDIACODEC_HWACCEL 0
 %define CONFIG_VP9_VAAPI_HWACCEL 0
 %define CONFIG_WMV3_D3D11VA_HWACCEL 1
 %define CONFIG_WMV3_DXVA2_HWACCEL 1
diff --git a/SMP/config.h b/SMP/config.h
index d8aaff792bb9d1d9e7ddd68b160d9418056c88bf..1db879a245e2d351da7c87755fd8b3e02fb5a8a9 100644
--- a/SMP/config.h
+++ b/SMP/config.h
@@ -1205,9 +1205,12 @@
 #define CONFIG_MPEG1_CUVID_DECODER 0
 #define CONFIG_MPEG2_CUVID_DECODER 0
 #define CONFIG_MPEG4_CUVID_DECODER 0
+#define CONFIG_MPEG4_MEDIACODEC_DECODER 0
 #define CONFIG_VC1_CUVID_DECODER 0
 #define CONFIG_VP8_CUVID_DECODER 0
+#define CONFIG_VP8_MEDIACODEC_DECODER 0
 #define CONFIG_VP9_CUVID_DECODER 0
+#define CONFIG_VP9_MEDIACODEC_DECODER 0
 #define CONFIG_AA_DEMUXER 1
 #define CONFIG_AAC_DEMUXER 1
 #define CONFIG_AC3_DEMUXER 1
@@ -2014,6 +2017,7 @@
 #define CONFIG_MPEG2_VDPAU_HWACCEL 0
 #define CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL 0
 #define CONFIG_MPEG4_CUVID_HWACCEL 0
+#define CONFIG_MPEG4_MEDIACODEC_HWACCEL 0
 #define CONFIG_MPEG4_MMAL_HWACCEL 0
 #define CONFIG_MPEG4_VAAPI_HWACCEL 0
 #define CONFIG_MPEG4_VDPAU_HWACCEL 0
@@ -2026,6 +2030,7 @@
 #define CONFIG_VC1_MMAL_HWACCEL 0
 #define CONFIG_VC1_QSV_HWACCEL 1
 #define CONFIG_VP8_CUVID_HWACCEL 0
+#define CONFIG_VP8_MEDIACODEC_HWACCEL 0
 #define CONFIG_VP9_CUVID_HWACCEL 0
 #include <sdkddkver.h>
 #if defined(NTDDI_WIN10_TH2)
@@ -2039,6 +2044,7 @@
 #else
 #   define CONFIG_VP9_DXVA2_HWACCEL 0
 #endif
+#define CONFIG_VP9_MEDIACODEC_HWACCEL 0
 #define CONFIG_VP9_VAAPI_HWACCEL 0
 #define CONFIG_WMV3_D3D11VA_HWACCEL 1
 #define CONFIG_WMV3_DXVA2_HWACCEL 1
diff --git a/SMP/libavcodec.vcxproj b/SMP/libavcodec.vcxproj
index 39b8bc411da5c1a8f14d8843a2cd7802633c6c4d..85095f96852453f477ea94ac818390813eadfcd3 100644
--- a/SMP/libavcodec.vcxproj
+++ b/SMP/libavcodec.vcxproj
@@ -112,6 +112,7 @@
     <YASM Include="..\libavcodec\x86\vp8dsp_loopfilter.asm" />
     <YASM Include="..\libavcodec\x86\aacpsdsp.asm" />
     <YASM Include="..\libavcodec\x86\sbrdsp.asm" />
+    <YASM Include="..\libavcodec\x86\aacencdsp.asm" />
     <YASM Include="..\libavcodec\x86\g722dsp.asm" />
     <YASM Include="..\libavcodec\x86\alacdsp.asm" />
     <YASM Include="..\libavcodec\x86\pngdsp.asm" />
@@ -909,6 +910,7 @@
     <ClCompile Include="..\libavcodec\x86\vp8dsp_init.c" />
     <ClCompile Include="..\libavcodec\x86\aacpsdsp_init.c" />
     <ClCompile Include="..\libavcodec\x86\sbrdsp_init.c" />
+    <ClCompile Include="..\libavcodec\x86\aacencdsp_init.c" />
     <ClCompile Include="..\libavcodec\x86\g722dsp_init.c" />
     <ClCompile Include="..\libavcodec\x86\alacdsp_init.c" />
     <ClCompile Include="..\libavcodec\x86\pngdsp_init.c" />
diff --git a/SMP/libavcodec.vcxproj.filters b/SMP/libavcodec.vcxproj.filters
index ad4183e9c802add252f0a376e2e0ed1f5dda06f9..9f9b36801b940897f0826d7c1618a3f85a916ac6 100644
--- a/SMP/libavcodec.vcxproj.filters
+++ b/SMP/libavcodec.vcxproj.filters
@@ -160,6 +160,9 @@
     <YASM Include="..\libavcodec\x86\sbrdsp.asm">
       <Filter>Source Files\libavcodec\x86</Filter>
     </YASM>
+    <YASM Include="..\libavcodec\x86\aacencdsp.asm">
+      <Filter>Source Files\libavcodec\x86</Filter>
+    </YASM>
     <YASM Include="..\libavcodec\x86\g722dsp.asm">
       <Filter>Source Files\libavcodec\x86</Filter>
     </YASM>
@@ -2547,6 +2550,9 @@
     <ClCompile Include="..\libavcodec\x86\sbrdsp_init.c">
       <Filter>Source Files\libavcodec\x86</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\x86\aacencdsp_init.c">
+      <Filter>Source Files\libavcodec\x86</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\x86\g722dsp_init.c">
       <Filter>Source Files\libavcodec\x86</Filter>
     </ClCompile>
diff --git a/SMP/libavutil.def b/SMP/libavutil.def
index 7b09642992920c646a66db0d25959a68b2797e29..17506069a24ee46b2b673efaa072276142d52c5f 100644
--- a/SMP/libavutil.def
+++ b/SMP/libavutil.def
@@ -16,6 +16,7 @@ EXPORTS
     av_aes_init
     av_append_path_component
     av_asprintf
+    av_assert0_fpu
     av_audio_fifo_alloc
     av_audio_fifo_drain
     av_audio_fifo_free