From d1a7dfaf0fb78b3bab98fee28829a104cb73bd3b Mon Sep 17 00:00:00 2001
From: Matt Oliver <protogonoi@gmail.com>
Date: Sun, 6 Nov 2022 20:58:36 +1100
Subject: [PATCH] project: Update for upstream merge.

---
 SMP/SMP.patch                         |  4 +-
 SMP/config.asm                        |  4 ++
 SMP/config.h                          |  4 ++
 SMP/config_components.h               | 19 +++++++
 SMP/ffmpeg.vcxproj                    |  1 +
 SMP/ffmpeg.vcxproj.filters            |  3 ++
 SMP/libavcodec.vcxproj.filters        | 73 ++++++++++++++++++++-------
 SMP/libavcodec/bsf_list.c             |  1 +
 SMP/libavcodec/codec_list.c           |  6 +++
 SMP/libavcodec/dce_defs.c             |  4 +-
 SMP/libavcodec/parser_list.c          |  3 ++
 SMP/libavcodec_files.props            | 35 +++++++++----
 SMP/libavcodec_winrt.vcxproj.filters  | 73 ++++++++++++++++++++-------
 SMP/libavfilter.vcxproj.filters       |  6 +++
 SMP/libavfilter/filter_list.c         |  2 +
 SMP/libavfilter_files.props           |  2 +
 SMP/libavfilter_winrt.vcxproj.filters |  6 +++
 SMP/libavformat.vcxproj.filters       | 15 ++++--
 SMP/libavformat/demuxer_list.c        |  3 ++
 SMP/libavformat_files.props           |  5 +-
 SMP/libavformat_winrt.vcxproj.filters | 15 ++++--
 SMP/libavutil.def                     |  3 ++
 22 files changed, 231 insertions(+), 56 deletions(-)

diff --git a/SMP/SMP.patch b/SMP/SMP.patch
index 304d1bd9e3fd3..c7e77d24214e9 100644
--- a/SMP/SMP.patch
+++ b/SMP/SMP.patch
@@ -1,5 +1,5 @@
 diff --git a/fftools/opt_common.c b/fftools/opt_common.c
-index 7cd8b1c66e..0f7955fb15 100644
+index 8a06df82df..9a31622bb4 100644
 --- a/fftools/opt_common.c
 +++ b/fftools/opt_common.c
 @@ -48,6 +48,9 @@
@@ -13,7 +13,7 @@ index 7cd8b1c66e..0f7955fb15 100644
  #include "libavdevice/version.h"
  
 diff --git a/libavcodec/mfenc.c b/libavcodec/mfenc.c
-index d5c241d169..6d4006726b 100644
+index 36a6d8482d..bcb42d47fc 100644
 --- a/libavcodec/mfenc.c
 +++ b/libavcodec/mfenc.c
 @@ -59,6 +59,10 @@ typedef struct MFContext {
diff --git a/SMP/config.asm b/SMP/config.asm
index eb399db0dcd44..a31321b6cc833 100644
--- a/SMP/config.asm
+++ b/SMP/config.asm
@@ -70,6 +70,7 @@
 %define HAVE_POWER8 0
 %define HAVE_PPC4XX 0
 %define HAVE_VSX 0
+%define HAVE_RVV 0
 %define HAVE_AESNI 1
 %define HAVE_AMD3DNOW 1
 %define HAVE_AMD3DNOWEXT 1
@@ -118,6 +119,7 @@
 %define HAVE_POWER8_EXTERNAL 0
 %define HAVE_PPC4XX_EXTERNAL 0
 %define HAVE_VSX_EXTERNAL 0
+%define HAVE_RVV_EXTERNAL 0
 %define HAVE_AESNI_EXTERNAL 1
 %define HAVE_AMD3DNOW_EXTERNAL 1
 %define HAVE_AMD3DNOWEXT_EXTERNAL 1
@@ -166,6 +168,7 @@
 %define HAVE_POWER8_INLINE 0
 %define HAVE_PPC4XX_INLINE 0
 %define HAVE_VSX_INLINE 0
+%define HAVE_RVV_INLINE 0
 %define HAVE_AESNI_INLINE 1
 %define HAVE_AMD3DNOW_INLINE 1
 %define HAVE_AMD3DNOWEXT_INLINE 1
@@ -345,6 +348,7 @@
 %define HAVE_NANOSLEEP 0
 %define HAVE_PEEKNAMEDPIPE 1
 %define HAVE_POSIX_MEMALIGN 0
+%define HAVE_PRCTL 0
 %define HAVE_PTHREAD_CANCEL 0
 %define HAVE_SCHED_GETAFFINITY 0
 %define HAVE_SECITEMIMPORT 0
diff --git a/SMP/config.h b/SMP/config.h
index e000877aef230..693172b755785 100644
--- a/SMP/config.h
+++ b/SMP/config.h
@@ -106,6 +106,7 @@
 #define HAVE_POWER8 0
 #define HAVE_PPC4XX 0
 #define HAVE_VSX 0
+#define HAVE_RVV 0
 #define HAVE_AESNI 1
 #define HAVE_AMD3DNOW 1
 #define HAVE_AMD3DNOWEXT 1
@@ -154,6 +155,7 @@
 #define HAVE_POWER8_EXTERNAL 0
 #define HAVE_PPC4XX_EXTERNAL 0
 #define HAVE_VSX_EXTERNAL 0
+#define HAVE_RVV_EXTERNAL 0
 #define HAVE_AESNI_EXTERNAL 1
 #define HAVE_AMD3DNOW_EXTERNAL 1
 #define HAVE_AMD3DNOWEXT_EXTERNAL 1
@@ -202,6 +204,7 @@
 #define HAVE_POWER8_INLINE 0
 #define HAVE_PPC4XX_INLINE 0
 #define HAVE_VSX_INLINE 0
+#define HAVE_RVV_INLINE 0
 #define HAVE_AESNI_INLINE ARCH_X86 && HAVE_INLINE_ASM
 #define HAVE_AMD3DNOW_INLINE ARCH_X86 && HAVE_INLINE_ASM
 #define HAVE_AMD3DNOWEXT_INLINE ARCH_X86 && HAVE_INLINE_ASM
@@ -409,6 +412,7 @@
 #define HAVE_NANOSLEEP 0
 #define HAVE_PEEKNAMEDPIPE 1
 #define HAVE_POSIX_MEMALIGN 0
+#define HAVE_PRCTL 0
 #define HAVE_PTHREAD_CANCEL 0
 #define HAVE_SCHED_GETAFFINITY 0
 #define HAVE_SECITEMIMPORT 0
diff --git a/SMP/config_components.h b/SMP/config_components.h
index 560326fc9dd32..edcaf62a85e46 100644
--- a/SMP/config_components.h
+++ b/SMP/config_components.h
@@ -29,6 +29,7 @@
 #define CONFIG_CHOMP_BSF 1
 #define CONFIG_DUMP_EXTRADATA_BSF 1
 #define CONFIG_DCA_CORE_BSF 1
+#define CONFIG_DTS2PTS_BSF 1
 #define CONFIG_DV_ERROR_MARKER_BSF 1
 #define CONFIG_EAC3_CORE_BSF 1
 #define CONFIG_EXTRACT_EXTRADATA_BSF 1
@@ -191,6 +192,7 @@
 #define CONFIG_M101_DECODER 1
 #define CONFIG_MAGICYUV_DECODER 1
 #define CONFIG_MDEC_DECODER 1
+#define CONFIG_MEDIA100_DECODER 1
 #define CONFIG_MIMIC_DECODER 1
 #define CONFIG_MJPEG_DECODER 1
 #define CONFIG_MJPEGB_DECODER 1
@@ -341,6 +343,7 @@
 #define CONFIG_VP9_RKMPP_DECODER 0
 #define CONFIG_VP9_V4L2M2M_DECODER 0
 #define CONFIG_VQA_DECODER 1
+#define CONFIG_VQC_DECODER 1
 #define CONFIG_WBMP_DECODER 1
 #define CONFIG_WEBP_DECODER 1
 #define CONFIG_WCMV_DECODER 1
@@ -376,6 +379,7 @@
 #define CONFIG_ALS_DECODER 1
 #define CONFIG_AMRNB_DECODER 1
 #define CONFIG_AMRWB_DECODER 1
+#define CONFIG_APAC_DECODER 1
 #define CONFIG_APE_DECODER 1
 #define CONFIG_APTX_DECODER 1
 #define CONFIG_APTX_HD_DECODER 1
@@ -388,6 +392,7 @@
 #define CONFIG_BINKAUDIO_DCT_DECODER 1
 #define CONFIG_BINKAUDIO_RDFT_DECODER 1
 #define CONFIG_BMV_AUDIO_DECODER 1
+#define CONFIG_BONK_DECODER 1
 #define CONFIG_COOK_DECODER 1
 #define CONFIG_DCA_DECODER 1
 #define CONFIG_DFPWM_DECODER 1
@@ -404,6 +409,7 @@
 #define CONFIG_FASTAUDIO_DECODER 1
 #define CONFIG_FFWAVESYNTH_DECODER 1
 #define CONFIG_FLAC_DECODER 1
+#define CONFIG_FTR_DECODER 1
 #define CONFIG_G723_1_DECODER 1
 #define CONFIG_G729_DECODER 1
 #define CONFIG_GSM_DECODER 1
@@ -418,6 +424,7 @@
 #define CONFIG_MACE3_DECODER 1
 #define CONFIG_MACE6_DECODER 1
 #define CONFIG_METASOUND_DECODER 1
+#define CONFIG_MISC4_DECODER 1
 #define CONFIG_MLP_DECODER 1
 #define CONFIG_MP1_DECODER 1
 #define CONFIG_MP1FLOAT_DECODER 1
@@ -909,6 +916,8 @@
 #define CONFIG_AAC_MF_ENCODER 1
 #define CONFIG_AC3_MF_ENCODER 1
 #define CONFIG_H263_V4L2M2M_ENCODER 0
+#define CONFIG_AV1_NVENC_ENCODER 0
+#define CONFIG_AV1_QSV_ENCODER 0
 #define CONFIG_LIBOPENH264_ENCODER 0
 #if CONFIG_AMF
 #   define CONFIG_H264_AMF_ENCODER 1
@@ -1184,6 +1193,7 @@
 #define CONFIG_DVDSUB_PARSER 1
 #define CONFIG_DVD_NAV_PARSER 1
 #define CONFIG_FLAC_PARSER 1
+#define CONFIG_FTR_PARSER 1
 #define CONFIG_G723_1_PARSER 1
 #define CONFIG_G729_PARSER 1
 #define CONFIG_GIF_PARSER 1
@@ -1195,6 +1205,7 @@
 #define CONFIG_HDR_PARSER 1
 #define CONFIG_IPU_PARSER 1
 #define CONFIG_JPEG2000_PARSER 1
+#define CONFIG_MISC4_PARSER 1
 #define CONFIG_MJPEG_PARSER 1
 #define CONFIG_MLP_PARSER 1
 #define CONFIG_MPEG4VIDEO_PARSER 1
@@ -1217,6 +1228,7 @@
 #define CONFIG_WEBP_PARSER 1
 #define CONFIG_XBM_PARSER 1
 #define CONFIG_XMA_PARSER 1
+#define CONFIG_XWD_PARSER 1
 #define CONFIG_ALSA_INDEV 0
 #define CONFIG_ANDROID_CAMERA_INDEV 0
 #define CONFIG_AVFOUNDATION_INDEV 0
@@ -1419,9 +1431,11 @@
 #define CONFIG_AVGBLUR_FILTER 1
 #define CONFIG_AVGBLUR_OPENCL_FILTER 0
 #define CONFIG_AVGBLUR_VULKAN_FILTER 0
+#define CONFIG_BACKGROUNDKEY_FILTER 1
 #define CONFIG_BBOX_FILTER 1
 #define CONFIG_BENCH_FILTER 1
 #define CONFIG_BILATERAL_FILTER 1
+#define CONFIG_BILATERAL_CUDA_FILTER 0
 #define CONFIG_BITPLANENOISE_FILTER 1
 #define CONFIG_BLACKDETECT_FILTER 1
 #define CONFIG_BLACKFRAME_FILTER 1
@@ -1454,6 +1468,7 @@
 #define CONFIG_COLORMAP_FILTER 1
 #define CONFIG_COLORMATRIX_FILTER 1
 #define CONFIG_COLORSPACE_FILTER 1
+#define CONFIG_COLORSPACE_CUDA_FILTER 0
 #define CONFIG_COLORTEMPERATURE_FILTER 1
 #define CONFIG_CONVOLUTION_FILTER 1
 #define CONFIG_CONVOLUTION_OPENCL_FILTER 0
@@ -1808,6 +1823,7 @@
 #define CONFIG_TESTSRC2_FILTER 1
 #define CONFIG_YUVTESTSRC_FILTER 1
 #define CONFIG_NULLSINK_FILTER 1
+#define CONFIG_A3DSCOPE_FILTER 1
 #define CONFIG_ABITSCOPE_FILTER 1
 #define CONFIG_ADRAWGRAPH_FILTER 1
 #define CONFIG_AGRAPHMONITOR_FILTER 1
@@ -1849,6 +1865,7 @@
 #define CONFIG_AMRNB_DEMUXER 1
 #define CONFIG_AMRWB_DEMUXER 1
 #define CONFIG_ANM_DEMUXER 1
+#define CONFIG_APAC_DEMUXER 1
 #define CONFIG_APC_DEMUXER 1
 #define CONFIG_APE_DEMUXER 1
 #define CONFIG_APM_DEMUXER 1
@@ -1882,6 +1899,7 @@
 #define CONFIG_BFSTM_DEMUXER 1
 #define CONFIG_BRSTM_DEMUXER 1
 #define CONFIG_BOA_DEMUXER 1
+#define CONFIG_BONK_DEMUXER 1
 #define CONFIG_C93_DEMUXER 1
 #define CONFIG_CAF_DEMUXER 1
 #define CONFIG_CAVSVIDEO_DEMUXER 1
@@ -1966,6 +1984,7 @@
 #define CONFIG_JV_DEMUXER 1
 #define CONFIG_KUX_DEMUXER 1
 #define CONFIG_KVAG_DEMUXER 1
+#define CONFIG_LAF_DEMUXER 1
 #define CONFIG_LMLM4_DEMUXER 1
 #define CONFIG_LOAS_DEMUXER 1
 #define CONFIG_LUODAT_DEMUXER 1
diff --git a/SMP/ffmpeg.vcxproj b/SMP/ffmpeg.vcxproj
index 15950a4cfa3c8..738eb733d0969 100644
--- a/SMP/ffmpeg.vcxproj
+++ b/SMP/ffmpeg.vcxproj
@@ -47,6 +47,7 @@
     <ClCompile Include="..\fftools\ffmpeg_filter.c" />
     <ClCompile Include="..\fftools\ffmpeg_hw.c" />
     <ClCompile Include="..\fftools\ffmpeg_mux.c" />
+    <ClCompile Include="..\fftools\ffmpeg_mux_init.c" />
     <ClCompile Include="..\fftools\ffmpeg_opt.c" />
     <ClCompile Include="..\fftools\objpool.c" />
     <ClCompile Include="..\fftools\sync_queue.c" />
diff --git a/SMP/ffmpeg.vcxproj.filters b/SMP/ffmpeg.vcxproj.filters
index 54413a392590b..97f76a0c87862 100644
--- a/SMP/ffmpeg.vcxproj.filters
+++ b/SMP/ffmpeg.vcxproj.filters
@@ -38,6 +38,9 @@
     <ClCompile Include="..\fftools\ffmpeg_mux.c">
       <Filter>Source Files\fftools</Filter>
     </ClCompile>
+    <ClCompile Include="..\fftools\ffmpeg_mux_init.c">
+      <Filter>Source Files\fftools</Filter>
+    </ClCompile>
     <ClCompile Include="..\fftools\ffmpeg_opt.c">
       <Filter>Source Files\fftools</Filter>
     </ClCompile>
diff --git a/SMP/libavcodec.vcxproj.filters b/SMP/libavcodec.vcxproj.filters
index 5148521d17d58..07ac3bf7911f7 100644
--- a/SMP/libavcodec.vcxproj.filters
+++ b/SMP/libavcodec.vcxproj.filters
@@ -124,6 +124,9 @@
     <NASM Include="..\libavcodec\x86\lossless_videoencdsp.asm">
       <Filter>Source Files\libavcodec\x86</Filter>
     </NASM>
+    <NASM Include="..\libavcodec\x86\lpc.asm">
+      <Filter>Source Files\libavcodec\x86</Filter>
+    </NASM>
     <NASM Include="..\libavcodec\x86\mdct15.asm">
       <Filter>Source Files\libavcodec\x86</Filter>
     </NASM>
@@ -585,9 +588,6 @@
     <ClCompile Include="..\libavcodec\jpegtables.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\lpc.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavcodec\lsp.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -636,9 +636,6 @@
     <ClCompile Include="..\libavcodec\mpegvideo.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\mpegvideodsp.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavcodec\rl.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -684,6 +681,9 @@
     <ClCompile Include="..\libavcodec\mss34dsp.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\jpegquanttables.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\rangecoder.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -903,6 +903,9 @@
     <ClCompile Include="..\libavcodec\cga_data.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\apac.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\apedec.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -1038,6 +1041,9 @@
     <ClCompile Include="..\libavcodec\bmvvideo.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\bonk.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\brenderpix.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -1380,6 +1386,9 @@
     <ClCompile Include="..\libavcodec\frwu.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\ftr.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\g2meet.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -1680,10 +1689,10 @@
     <ClCompile Include="..\libavcodec\mdec.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\metasound.c">
+    <ClCompile Include="..\libavcodec\media100.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\metasound_data.c">
+    <ClCompile Include="..\libavcodec\metasound.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
     <ClCompile Include="..\libavcodec\twinvq.c">
@@ -1695,6 +1704,9 @@
     <ClCompile Include="..\libavcodec\mimic.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\misc4.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\mjpegdec.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -1755,6 +1767,9 @@
     <ClCompile Include="..\libavcodec\mpeg12enc.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\mpeg4videodsp.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\mpeg4videoenc.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -1848,15 +1863,12 @@
     <ClCompile Include="..\libavcodec\opusdec.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\opus.c">
+    <ClCompile Include="..\libavcodec\opusdec_celt.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
     <ClCompile Include="..\libavcodec\opus_celt.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\opus_rc.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavcodec\opus_pvq.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -1869,6 +1881,12 @@
     <ClCompile Include="..\libavcodec\vorbis_data.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\opus_parse.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavcodec\opus_rc.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\opusenc.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -2112,6 +2130,9 @@
     <ClCompile Include="..\libavcodec\sonic.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\speedhqdec.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\speedhq.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -2373,6 +2394,9 @@
     <ClCompile Include="..\libavcodec\vqavideo.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\vqcdec.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\wavpack.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -2673,6 +2697,9 @@
     <ClCompile Include="..\libavcodec\flac_parser.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\ftr_parser.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\g723_1_parser.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -2706,6 +2733,9 @@
     <ClCompile Include="..\libavcodec\jpeg2000_parser.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\misc4_parser.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\mjpeg_parser.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -2769,6 +2799,9 @@
     <ClCompile Include="..\libavcodec\xma_parser.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\xwd_parser.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\aac_adtstoasc_bsf.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -2790,6 +2823,9 @@
     <ClCompile Include="..\libavcodec\dca_core_bsf.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\dts2pts_bsf.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\dv_error_marker_bsf.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -2976,6 +3012,9 @@
     <ClCompile Include="..\libavcodec\x86\idctdsp_init.c">
       <Filter>Source Files\libavcodec\x86</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\x86\lpc_init.c">
+      <Filter>Source Files\libavcodec\x86</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\x86\mdct15_init.c">
       <Filter>Source Files\libavcodec\x86</Filter>
     </ClCompile>
@@ -3279,6 +3318,9 @@
     <ClCompile Include="..\libavcodec\lossless_videoencdsp.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\lpc.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\me_cmp.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -3390,19 +3432,16 @@
     <ClCompile Include="..\libavcodec\g722dsp.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\x86\lpc.c">
-      <Filter>Source Files\libavcodec\x86</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavcodec\x86\mpegaudiodsp.c">
       <Filter>Source Files\libavcodec\x86</Filter>
     </ClCompile>
     <ClCompile Include="..\libavcodec\x86\mpegvideo.c">
       <Filter>Source Files\libavcodec\x86</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\x86\mpegvideodsp.c">
+    <ClCompile Include="..\libavcodec\x86\cavsdsp.c">
       <Filter>Source Files\libavcodec\x86</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\x86\cavsdsp.c">
+    <ClCompile Include="..\libavcodec\x86\mpeg4videodsp.c">
       <Filter>Source Files\libavcodec\x86</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/SMP/libavcodec/bsf_list.c b/SMP/libavcodec/bsf_list.c
index 2876f83cd65dd..175765346c114 100644
--- a/SMP/libavcodec/bsf_list.c
+++ b/SMP/libavcodec/bsf_list.c
@@ -28,6 +28,7 @@ static const FFBitStreamFilter *bitstream_filters[] = {
     &ff_chomp_bsf,
     &ff_dump_extradata_bsf,
     &ff_dca_core_bsf,
+    &ff_dts2pts_bsf,
     &ff_dv_error_marker_bsf,
     &ff_eac3_core_bsf,
     &ff_extract_extradata_bsf,
diff --git a/SMP/libavcodec/codec_list.c b/SMP/libavcodec/codec_list.c
index eafaf21020bfe..9044dc5cffb16 100644
--- a/SMP/libavcodec/codec_list.c
+++ b/SMP/libavcodec/codec_list.c
@@ -358,6 +358,7 @@ static const FFCodec *codec_list[] = {
     &ff_m101_decoder,
     &ff_magicyuv_decoder,
     &ff_mdec_decoder,
+    &ff_media100_decoder,
     &ff_mimic_decoder,
     &ff_mjpeg_decoder,
     &ff_mjpegb_decoder,
@@ -488,6 +489,7 @@ static const FFCodec *codec_list[] = {
     &ff_vp8_decoder,
     &ff_vp9_decoder,
     &ff_vqa_decoder,
+    &ff_vqc_decoder,
     &ff_wbmp_decoder,
     &ff_webp_decoder,
     &ff_wcmv_decoder,
@@ -522,6 +524,7 @@ static const FFCodec *codec_list[] = {
     &ff_als_decoder,
     &ff_amrnb_decoder,
     &ff_amrwb_decoder,
+    &ff_apac_decoder,
     &ff_ape_decoder,
     &ff_aptx_decoder,
     &ff_aptx_hd_decoder,
@@ -534,6 +537,7 @@ static const FFCodec *codec_list[] = {
     &ff_binkaudio_dct_decoder,
     &ff_binkaudio_rdft_decoder,
     &ff_bmv_audio_decoder,
+    &ff_bonk_decoder,
     &ff_cook_decoder,
     &ff_dca_decoder,
     &ff_dfpwm_decoder,
@@ -550,6 +554,7 @@ static const FFCodec *codec_list[] = {
     &ff_fastaudio_decoder,
     &ff_ffwavesynth_decoder,
     &ff_flac_decoder,
+    &ff_ftr_decoder,
     &ff_g723_1_decoder,
     &ff_g729_decoder,
     &ff_gsm_decoder,
@@ -564,6 +569,7 @@ static const FFCodec *codec_list[] = {
     &ff_mace3_decoder,
     &ff_mace6_decoder,
     &ff_metasound_decoder,
+    &ff_misc4_decoder,
     &ff_mlp_decoder,
     &ff_mp1_decoder,
     &ff_mp1float_decoder,
diff --git a/SMP/libavcodec/dce_defs.c b/SMP/libavcodec/dce_defs.c
index e8820864e50e9..4ed2f65a58658 100644
--- a/SMP/libavcodec/dce_defs.c
+++ b/SMP/libavcodec/dce_defs.c
@@ -43,13 +43,13 @@ void ff_fdct_sse2(int16_t *block) {return;}
 void ff_flac_decorrelate_indep8_16_avx(uint8_t **out, int32_t **in, int channels, int len, int shift) {return;}
 #endif
 #if !(ARCH_X86_64)
-void ff_flac_decorrelate_indep8_16_sse2(uint8_t **out, int32_t **in, int channels, int len, int shift) {return;}
+void ff_flac_decorrelate_indep8_16_ssse3(uint8_t **out, int32_t **in, int channels, int len, int shift) {return;}
 #endif
 #if !(ARCH_X86_64)
 void ff_flac_decorrelate_indep8_32_avx(uint8_t **out, int32_t **in, int channels, int len, int shift) {return;}
 #endif
 #if !(ARCH_X86_64)
-void ff_flac_decorrelate_indep8_32_sse2(uint8_t **out, int32_t **in, int channels, int len, int shift) {return;}
+void ff_flac_decorrelate_indep8_32_ssse3(uint8_t **out, int32_t **in, int channels, int len, int shift) {return;}
 #endif
 #if !(ARCH_X86_64)
 void ff_hevc_h_loop_filter_luma_10_avx(uint8_t *pix, ptrdiff_t stride, int beta, const int *tc, const uint8_t *no_p, const uint8_t *no_q) {return;}
diff --git a/SMP/libavcodec/parser_list.c b/SMP/libavcodec/parser_list.c
index ea22fac39fcb5..187f748a81f1e 100644
--- a/SMP/libavcodec/parser_list.c
+++ b/SMP/libavcodec/parser_list.c
@@ -43,6 +43,7 @@ static const AVCodecParser *parser_list[] = {
     &ff_dvdsub_parser,
     &ff_dvd_nav_parser,
     &ff_flac_parser,
+    &ff_ftr_parser,
     &ff_g723_1_parser,
     &ff_g729_parser,
     &ff_gif_parser,
@@ -54,6 +55,7 @@ static const AVCodecParser *parser_list[] = {
     &ff_hdr_parser,
     &ff_ipu_parser,
     &ff_jpeg2000_parser,
+    &ff_misc4_parser,
     &ff_mjpeg_parser,
     &ff_mlp_parser,
     &ff_mpeg4video_parser,
@@ -76,4 +78,5 @@ static const AVCodecParser *parser_list[] = {
     &ff_webp_parser,
     &ff_xbm_parser,
     &ff_xma_parser,
+    &ff_xwd_parser,
     NULL };
\ No newline at end of file
diff --git a/SMP/libavcodec_files.props b/SMP/libavcodec_files.props
index 68e6e07265ee4..9cdc1c2fd5d1e 100644
--- a/SMP/libavcodec_files.props
+++ b/SMP/libavcodec_files.props
@@ -42,6 +42,7 @@
     <NASM Include="..\libavcodec\x86\lossless_audiodsp.asm" />
     <NASM Include="..\libavcodec\x86\lossless_videodsp.asm" />
     <NASM Include="..\libavcodec\x86\lossless_videoencdsp.asm" />
+    <NASM Include="..\libavcodec\x86\lpc.asm" />
     <NASM Include="..\libavcodec\x86\mdct15.asm" />
     <NASM Include="..\libavcodec\x86\me_cmp.asm" />
     <NASM Include="..\libavcodec\x86\imdct36.asm" />
@@ -197,7 +198,6 @@
     <ClCompile Include="..\libavcodec\msmpeg4data.c" />
     <ClCompile Include="..\libavcodec\ivi_dsp.c" />
     <ClCompile Include="..\libavcodec\jpegtables.c" />
-    <ClCompile Include="..\libavcodec\lpc.c" />
     <ClCompile Include="..\libavcodec\lsp.c" />
     <ClCompile Include="..\libavcodec\lzf.c" />
     <ClCompile Include="..\libavcodec\mdct_float.c" />
@@ -214,7 +214,6 @@
     <ClCompile Include="..\libavcodec\mpegaudiotabs.c" />
     <ClCompile Include="..\libavcodec\mpeg4audio.c" />
     <ClCompile Include="..\libavcodec\mpegvideo.c" />
-    <ClCompile Include="..\libavcodec\mpegvideodsp.c" />
     <ClCompile Include="..\libavcodec\rl.c" />
     <ClCompile Include="..\libavcodec\mpegvideo_motion.c" />
     <ClCompile Include="..\libavcodec\mpegvideodata.c" />
@@ -230,6 +229,7 @@
     <ClCompile Include="..\libavcodec\msmpeg4.c" />
     <ClCompile Include="..\libavcodec\msmpeg4enc.c" />
     <ClCompile Include="..\libavcodec\mss34dsp.c" />
+    <ClCompile Include="..\libavcodec\jpegquanttables.c" />
     <ClCompile Include="..\libavcodec\rangecoder.c" />
     <ClCompile Include="..\libavcodec\rdft.c" />
     <ClCompile Include="..\libavcodec\sinewin.c" />
@@ -303,6 +303,7 @@
     <ClCompile Include="..\libavcodec\anm.c" />
     <ClCompile Include="..\libavcodec\ansi.c" />
     <ClCompile Include="..\libavcodec\cga_data.c" />
+    <ClCompile Include="..\libavcodec\apac.c" />
     <ClCompile Include="..\libavcodec\apedec.c" />
     <ClCompile Include="..\libavcodec\aptxdec.c" />
     <ClCompile Include="..\libavcodec\aptx.c" />
@@ -348,6 +349,7 @@
     <ClCompile Include="..\libavcodec\bmpenc.c" />
     <ClCompile Include="..\libavcodec\bmvaudio.c" />
     <ClCompile Include="..\libavcodec\bmvvideo.c" />
+    <ClCompile Include="..\libavcodec\bonk.c" />
     <ClCompile Include="..\libavcodec\brenderpix.c" />
     <ClCompile Include="..\libavcodec\c93.c" />
     <ClCompile Include="..\libavcodec\cavs.c" />
@@ -462,6 +464,7 @@
     <ClCompile Include="..\libavcodec\4xm.c" />
     <ClCompile Include="..\libavcodec\fraps.c" />
     <ClCompile Include="..\libavcodec\frwu.c" />
+    <ClCompile Include="..\libavcodec\ftr.c" />
     <ClCompile Include="..\libavcodec\g2meet.c" />
     <ClCompile Include="..\libavcodec\elsdec.c" />
     <ClCompile Include="..\libavcodec\mjpegdec_common.c" />
@@ -562,11 +565,12 @@
     <ClCompile Include="..\libavcodec\magicyuv.c" />
     <ClCompile Include="..\libavcodec\magicyuvenc.c" />
     <ClCompile Include="..\libavcodec\mdec.c" />
+    <ClCompile Include="..\libavcodec\media100.c" />
     <ClCompile Include="..\libavcodec\metasound.c" />
-    <ClCompile Include="..\libavcodec\metasound_data.c" />
     <ClCompile Include="..\libavcodec\twinvq.c" />
     <ClCompile Include="..\libavcodec\microdvddec.c" />
     <ClCompile Include="..\libavcodec\mimic.c" />
+    <ClCompile Include="..\libavcodec\misc4.c" />
     <ClCompile Include="..\libavcodec\mjpegdec.c" />
     <ClCompile Include="..\libavcodec\mjpegenc_huffman.c" />
     <ClCompile Include="..\libavcodec\mjpegbdec.c" />
@@ -587,6 +591,7 @@
     <ClCompile Include="..\libavcodec\mpc.c" />
     <ClCompile Include="..\libavcodec\mpc8.c" />
     <ClCompile Include="..\libavcodec\mpeg12enc.c" />
+    <ClCompile Include="..\libavcodec\mpeg4videodsp.c" />
     <ClCompile Include="..\libavcodec\mpeg4videoenc.c" />
     <ClCompile Include="..\libavcodec\mpl2dec.c" />
     <ClCompile Include="..\libavcodec\mss3.c" />
@@ -618,13 +623,14 @@
     <ClCompile Include="..\libavcodec\on2avc.c" />
     <ClCompile Include="..\libavcodec\on2avcdata.c" />
     <ClCompile Include="..\libavcodec\opusdec.c" />
-    <ClCompile Include="..\libavcodec\opus.c" />
+    <ClCompile Include="..\libavcodec\opusdec_celt.c" />
     <ClCompile Include="..\libavcodec\opus_celt.c" />
-    <ClCompile Include="..\libavcodec\opus_rc.c" />
     <ClCompile Include="..\libavcodec\opus_pvq.c" />
     <ClCompile Include="..\libavcodec\opus_silk.c" />
     <ClCompile Include="..\libavcodec\opustab.c" />
     <ClCompile Include="..\libavcodec\vorbis_data.c" />
+    <ClCompile Include="..\libavcodec\opus_parse.c" />
+    <ClCompile Include="..\libavcodec\opus_rc.c" />
     <ClCompile Include="..\libavcodec\opusenc.c" />
     <ClCompile Include="..\libavcodec\opusenc_psy.c" />
     <ClCompile Include="..\libavcodec\pafaudio.c" />
@@ -706,6 +712,7 @@
     <ClCompile Include="..\libavcodec\snow_dwt.c" />
     <ClCompile Include="..\libavcodec\snowenc.c" />
     <ClCompile Include="..\libavcodec\sonic.c" />
+    <ClCompile Include="..\libavcodec\speedhqdec.c" />
     <ClCompile Include="..\libavcodec\speedhq.c" />
     <ClCompile Include="..\libavcodec\speedhqenc.c" />
     <ClCompile Include="..\libavcodec\speexdec.c" />
@@ -793,6 +800,7 @@
     <ClCompile Include="..\libavcodec\vp9dsp_10bpp.c" />
     <ClCompile Include="..\libavcodec\vp9dsp_12bpp.c" />
     <ClCompile Include="..\libavcodec\vqavideo.c" />
+    <ClCompile Include="..\libavcodec\vqcdec.c" />
     <ClCompile Include="..\libavcodec\wavpack.c" />
     <ClCompile Include="..\libavcodec\wavpackdata.c" />
     <ClCompile Include="..\libavcodec\wavpackenc.c" />
@@ -893,6 +901,7 @@
     <ClCompile Include="..\libavcodec\dvd_nav_parser.c" />
     <ClCompile Include="..\libavcodec\dvdsub_parser.c" />
     <ClCompile Include="..\libavcodec\flac_parser.c" />
+    <ClCompile Include="..\libavcodec\ftr_parser.c" />
     <ClCompile Include="..\libavcodec\g723_1_parser.c" />
     <ClCompile Include="..\libavcodec\g729_parser.c" />
     <ClCompile Include="..\libavcodec\gif_parser.c" />
@@ -904,6 +913,7 @@
     <ClCompile Include="..\libavcodec\hdr_parser.c" />
     <ClCompile Include="..\libavcodec\ipu_parser.c" />
     <ClCompile Include="..\libavcodec\jpeg2000_parser.c" />
+    <ClCompile Include="..\libavcodec\misc4_parser.c" />
     <ClCompile Include="..\libavcodec\mjpeg_parser.c" />
     <ClCompile Include="..\libavcodec\mlp_parse.c" />
     <ClCompile Include="..\libavcodec\mlp_parser.c" />
@@ -925,6 +935,7 @@
     <ClCompile Include="..\libavcodec\webp_parser.c" />
     <ClCompile Include="..\libavcodec\xbm_parser.c" />
     <ClCompile Include="..\libavcodec\xma_parser.c" />
+    <ClCompile Include="..\libavcodec\xwd_parser.c" />
     <ClCompile Include="..\libavcodec\aac_adtstoasc_bsf.c" />
     <ClCompile Include="..\libavcodec\av1_metadata_bsf.c" />
     <ClCompile Include="..\libavcodec\av1_frame_merge_bsf.c" />
@@ -932,6 +943,7 @@
     <ClCompile Include="..\libavcodec\chomp_bsf.c" />
     <ClCompile Include="..\libavcodec\dump_extradata_bsf.c" />
     <ClCompile Include="..\libavcodec\dca_core_bsf.c" />
+    <ClCompile Include="..\libavcodec\dts2pts_bsf.c" />
     <ClCompile Include="..\libavcodec\dv_error_marker_bsf.c" />
     <ClCompile Include="..\libavcodec\eac3_core_bsf.c" />
     <ClCompile Include="..\libavcodec\extract_extradata_bsf.c" />
@@ -994,6 +1006,7 @@
     <ClCompile Include="..\libavcodec\x86\huffyuvdsp_init.c" />
     <ClCompile Include="..\libavcodec\x86\huffyuvencdsp_init.c" />
     <ClCompile Include="..\libavcodec\x86\idctdsp_init.c" />
+    <ClCompile Include="..\libavcodec\x86\lpc_init.c" />
     <ClCompile Include="..\libavcodec\x86\mdct15_init.c" />
     <ClCompile Include="..\libavcodec\x86\me_cmp_init.c" />
     <ClCompile Include="..\libavcodec\x86\mpegvideoenc.c" />
@@ -1123,6 +1136,9 @@
     <ClCompile Include="..\libavcodec\lossless_videoencdsp.c">
       <ObjectFileName>$(IntDir)\libavcodec_lossless_videoencdsp.obj</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\lpc.c">
+      <ObjectFileName>$(IntDir)\libavcodec_lpc.obj</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\me_cmp.c">
       <ObjectFileName>$(IntDir)\libavcodec_me_cmp.obj</ObjectFileName>
     </ClCompile>
@@ -1234,21 +1250,18 @@
     <ClCompile Include="..\libavcodec\g722dsp.c">
       <ObjectFileName>$(IntDir)\libavcodec_g722dsp.obj</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\x86\lpc.c">
-      <ObjectFileName>$(IntDir)\libavcodec_x86_lpc.obj</ObjectFileName>
-    </ClCompile>
     <ClCompile Include="..\libavcodec\x86\mpegaudiodsp.c">
       <ObjectFileName>$(IntDir)\libavcodec_x86_mpegaudiodsp.obj</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\libavcodec\x86\mpegvideo.c">
       <ObjectFileName>$(IntDir)\libavcodec_x86_mpegvideo.obj</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\x86\mpegvideodsp.c">
-      <ObjectFileName>$(IntDir)\libavcodec_x86_mpegvideodsp.obj</ObjectFileName>
-    </ClCompile>
     <ClCompile Include="..\libavcodec\x86\cavsdsp.c">
       <ObjectFileName>$(IntDir)\libavcodec_x86_cavsdsp.obj</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\x86\mpeg4videodsp.c">
+      <ObjectFileName>$(IntDir)\libavcodec_x86_mpeg4videodsp.obj</ObjectFileName>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\libavcodec\ac3_parser.h" />
diff --git a/SMP/libavcodec_winrt.vcxproj.filters b/SMP/libavcodec_winrt.vcxproj.filters
index 5148521d17d58..07ac3bf7911f7 100644
--- a/SMP/libavcodec_winrt.vcxproj.filters
+++ b/SMP/libavcodec_winrt.vcxproj.filters
@@ -124,6 +124,9 @@
     <NASM Include="..\libavcodec\x86\lossless_videoencdsp.asm">
       <Filter>Source Files\libavcodec\x86</Filter>
     </NASM>
+    <NASM Include="..\libavcodec\x86\lpc.asm">
+      <Filter>Source Files\libavcodec\x86</Filter>
+    </NASM>
     <NASM Include="..\libavcodec\x86\mdct15.asm">
       <Filter>Source Files\libavcodec\x86</Filter>
     </NASM>
@@ -585,9 +588,6 @@
     <ClCompile Include="..\libavcodec\jpegtables.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\lpc.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavcodec\lsp.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -636,9 +636,6 @@
     <ClCompile Include="..\libavcodec\mpegvideo.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\mpegvideodsp.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavcodec\rl.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -684,6 +681,9 @@
     <ClCompile Include="..\libavcodec\mss34dsp.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\jpegquanttables.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\rangecoder.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -903,6 +903,9 @@
     <ClCompile Include="..\libavcodec\cga_data.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\apac.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\apedec.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -1038,6 +1041,9 @@
     <ClCompile Include="..\libavcodec\bmvvideo.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\bonk.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\brenderpix.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -1380,6 +1386,9 @@
     <ClCompile Include="..\libavcodec\frwu.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\ftr.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\g2meet.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -1680,10 +1689,10 @@
     <ClCompile Include="..\libavcodec\mdec.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\metasound.c">
+    <ClCompile Include="..\libavcodec\media100.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\metasound_data.c">
+    <ClCompile Include="..\libavcodec\metasound.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
     <ClCompile Include="..\libavcodec\twinvq.c">
@@ -1695,6 +1704,9 @@
     <ClCompile Include="..\libavcodec\mimic.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\misc4.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\mjpegdec.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -1755,6 +1767,9 @@
     <ClCompile Include="..\libavcodec\mpeg12enc.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\mpeg4videodsp.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\mpeg4videoenc.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -1848,15 +1863,12 @@
     <ClCompile Include="..\libavcodec\opusdec.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\opus.c">
+    <ClCompile Include="..\libavcodec\opusdec_celt.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
     <ClCompile Include="..\libavcodec\opus_celt.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\opus_rc.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavcodec\opus_pvq.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -1869,6 +1881,12 @@
     <ClCompile Include="..\libavcodec\vorbis_data.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\opus_parse.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavcodec\opus_rc.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\opusenc.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -2112,6 +2130,9 @@
     <ClCompile Include="..\libavcodec\sonic.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\speedhqdec.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\speedhq.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -2373,6 +2394,9 @@
     <ClCompile Include="..\libavcodec\vqavideo.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\vqcdec.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\wavpack.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -2673,6 +2697,9 @@
     <ClCompile Include="..\libavcodec\flac_parser.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\ftr_parser.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\g723_1_parser.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -2706,6 +2733,9 @@
     <ClCompile Include="..\libavcodec\jpeg2000_parser.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\misc4_parser.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\mjpeg_parser.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -2769,6 +2799,9 @@
     <ClCompile Include="..\libavcodec\xma_parser.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\xwd_parser.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\aac_adtstoasc_bsf.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -2790,6 +2823,9 @@
     <ClCompile Include="..\libavcodec\dca_core_bsf.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\dts2pts_bsf.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\dv_error_marker_bsf.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -2976,6 +3012,9 @@
     <ClCompile Include="..\libavcodec\x86\idctdsp_init.c">
       <Filter>Source Files\libavcodec\x86</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\x86\lpc_init.c">
+      <Filter>Source Files\libavcodec\x86</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\x86\mdct15_init.c">
       <Filter>Source Files\libavcodec\x86</Filter>
     </ClCompile>
@@ -3279,6 +3318,9 @@
     <ClCompile Include="..\libavcodec\lossless_videoencdsp.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\lpc.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\me_cmp.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -3390,19 +3432,16 @@
     <ClCompile Include="..\libavcodec\g722dsp.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\x86\lpc.c">
-      <Filter>Source Files\libavcodec\x86</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavcodec\x86\mpegaudiodsp.c">
       <Filter>Source Files\libavcodec\x86</Filter>
     </ClCompile>
     <ClCompile Include="..\libavcodec\x86\mpegvideo.c">
       <Filter>Source Files\libavcodec\x86</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\x86\mpegvideodsp.c">
+    <ClCompile Include="..\libavcodec\x86\cavsdsp.c">
       <Filter>Source Files\libavcodec\x86</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\x86\cavsdsp.c">
+    <ClCompile Include="..\libavcodec\x86\mpeg4videodsp.c">
       <Filter>Source Files\libavcodec\x86</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/SMP/libavfilter.vcxproj.filters b/SMP/libavfilter.vcxproj.filters
index 3dacd021a8493..99c9144fccad2 100644
--- a/SMP/libavfilter.vcxproj.filters
+++ b/SMP/libavfilter.vcxproj.filters
@@ -570,6 +570,9 @@
     <ClCompile Include="..\libavfilter\vf_avgblur.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_backgroundkey.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\bbox.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -1188,6 +1191,9 @@
     <ClCompile Include="..\libavfilter\vsink_nullsink.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\avf_a3dscope.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\avf_abitscope.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
diff --git a/SMP/libavfilter/filter_list.c b/SMP/libavfilter/filter_list.c
index d0dce409bbb9e..d682c5259f82e 100644
--- a/SMP/libavfilter/filter_list.c
+++ b/SMP/libavfilter/filter_list.c
@@ -164,6 +164,7 @@ static const AVFilter *filter_list[] = {
     &ff_vf_ass,
     &ff_vf_atadenoise,
     &ff_vf_avgblur,
+    &ff_vf_backgroundkey,
     &ff_vf_bbox,
     &ff_vf_bench,
     &ff_vf_bilateral,
@@ -478,6 +479,7 @@ static const AVFilter *filter_list[] = {
     &ff_vsrc_testsrc2,
     &ff_vsrc_yuvtestsrc,
     &ff_vsink_nullsink,
+    &ff_avf_a3dscope,
     &ff_avf_abitscope,
     &ff_avf_adrawgraph,
     &ff_avf_agraphmonitor,
diff --git a/SMP/libavfilter_files.props b/SMP/libavfilter_files.props
index 9f74aea20a228..6d3dea73ee19d 100644
--- a/SMP/libavfilter_files.props
+++ b/SMP/libavfilter_files.props
@@ -191,6 +191,7 @@
     <ClCompile Include="..\libavfilter\vf_amplify.c" />
     <ClCompile Include="..\libavfilter\vf_subtitles.c" />
     <ClCompile Include="..\libavfilter\vf_avgblur.c" />
+    <ClCompile Include="..\libavfilter\vf_backgroundkey.c" />
     <ClCompile Include="..\libavfilter\bbox.c" />
     <ClCompile Include="..\libavfilter\vf_bbox.c" />
     <ClCompile Include="..\libavfilter\vf_bilateral.c" />
@@ -397,6 +398,7 @@
     <ClCompile Include="..\libavfilter\vsrc_mptestsrc.c" />
     <ClCompile Include="..\libavfilter\vsrc_sierpinski.c" />
     <ClCompile Include="..\libavfilter\vsink_nullsink.c" />
+    <ClCompile Include="..\libavfilter\avf_a3dscope.c" />
     <ClCompile Include="..\libavfilter\avf_abitscope.c" />
     <ClCompile Include="..\libavfilter\avf_ahistogram.c" />
     <ClCompile Include="..\libavfilter\avf_aphasemeter.c" />
diff --git a/SMP/libavfilter_winrt.vcxproj.filters b/SMP/libavfilter_winrt.vcxproj.filters
index 3dacd021a8493..99c9144fccad2 100644
--- a/SMP/libavfilter_winrt.vcxproj.filters
+++ b/SMP/libavfilter_winrt.vcxproj.filters
@@ -570,6 +570,9 @@
     <ClCompile Include="..\libavfilter\vf_avgblur.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_backgroundkey.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\bbox.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -1188,6 +1191,9 @@
     <ClCompile Include="..\libavfilter\vsink_nullsink.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\avf_a3dscope.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\avf_abitscope.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
diff --git a/SMP/libavformat.vcxproj.filters b/SMP/libavformat.vcxproj.filters
index cec3f1fd79351..03585c8c46f6e 100644
--- a/SMP/libavformat.vcxproj.filters
+++ b/SMP/libavformat.vcxproj.filters
@@ -52,6 +52,9 @@
     <ClCompile Include="..\libavformat\dump.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\dv.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\format.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
@@ -304,6 +307,9 @@
     <ClCompile Include="..\libavformat\anm.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\apac.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\apc.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
@@ -436,6 +442,9 @@
     <ClCompile Include="..\libavformat\boadec.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\bonk.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\brstm.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
@@ -529,9 +538,6 @@
     <ClCompile Include="..\libavformat\dtsdec.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavformat\dv.c">
-      <Filter>Source Files\libavformat</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavformat\dvenc.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
@@ -784,6 +790,9 @@
     <ClCompile Include="..\libavformat\kvag.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\lafdec.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\latmenc.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
diff --git a/SMP/libavformat/demuxer_list.c b/SMP/libavformat/demuxer_list.c
index 6dc458544da6b..d0613ab5e442c 100644
--- a/SMP/libavformat/demuxer_list.c
+++ b/SMP/libavformat/demuxer_list.c
@@ -41,6 +41,7 @@ static const AVInputFormat *demuxer_list[] = {
     &ff_amrnb_demuxer,
     &ff_amrwb_demuxer,
     &ff_anm_demuxer,
+    &ff_apac_demuxer,
     &ff_apc_demuxer,
     &ff_ape_demuxer,
     &ff_apm_demuxer,
@@ -73,6 +74,7 @@ static const AVInputFormat *demuxer_list[] = {
     &ff_bfstm_demuxer,
     &ff_brstm_demuxer,
     &ff_boa_demuxer,
+    &ff_bonk_demuxer,
     &ff_c93_demuxer,
     &ff_caf_demuxer,
     &ff_cavsvideo_demuxer,
@@ -157,6 +159,7 @@ static const AVInputFormat *demuxer_list[] = {
     &ff_jv_demuxer,
     &ff_kux_demuxer,
     &ff_kvag_demuxer,
+    &ff_laf_demuxer,
     &ff_lmlm4_demuxer,
     &ff_loas_demuxer,
     &ff_luodat_demuxer,
diff --git a/SMP/libavformat_files.props b/SMP/libavformat_files.props
index 58535f181ebed..5fb868024e789 100644
--- a/SMP/libavformat_files.props
+++ b/SMP/libavformat_files.props
@@ -19,6 +19,7 @@
     <ClCompile Include="..\libavformat\demux.c" />
     <ClCompile Include="..\libavformat\demux_utils.c" />
     <ClCompile Include="..\libavformat\dump.c" />
+    <ClCompile Include="..\libavformat\dv.c" />
     <ClCompile Include="..\libavformat\format.c" />
     <ClCompile Include="..\libavformat\id3v1.c" />
     <ClCompile Include="..\libavformat\id3v2.c" />
@@ -103,6 +104,7 @@
     <ClCompile Include="..\libavformat\amr.c" />
     <ClCompile Include="..\libavformat\amvenc.c" />
     <ClCompile Include="..\libavformat\anm.c" />
+    <ClCompile Include="..\libavformat\apac.c" />
     <ClCompile Include="..\libavformat\apc.c" />
     <ClCompile Include="..\libavformat\ape.c" />
     <ClCompile Include="..\libavformat\apm.c" />
@@ -147,6 +149,7 @@
     <ClCompile Include="..\libavformat\rawvideodec.c" />
     <ClCompile Include="..\libavformat\bmv.c" />
     <ClCompile Include="..\libavformat\boadec.c" />
+    <ClCompile Include="..\libavformat\bonk.c" />
     <ClCompile Include="..\libavformat\brstm.c" />
     <ClCompile Include="..\libavformat\c93.c" />
     <ClCompile Include="..\libavformat\cafdec.c" />
@@ -178,7 +181,6 @@
     <ClCompile Include="..\libavformat\dss.c" />
     <ClCompile Include="..\libavformat\dtshddec.c" />
     <ClCompile Include="..\libavformat\dtsdec.c" />
-    <ClCompile Include="..\libavformat\dv.c" />
     <ClCompile Include="..\libavformat\dvenc.c" />
     <ClCompile Include="..\libavformat\dvbsub.c" />
     <ClCompile Include="..\libavformat\dvbtxt.c" />
@@ -263,6 +265,7 @@
     <ClCompile Include="..\libavformat\jacosubenc.c" />
     <ClCompile Include="..\libavformat\jvdec.c" />
     <ClCompile Include="..\libavformat\kvag.c" />
+    <ClCompile Include="..\libavformat\lafdec.c" />
     <ClCompile Include="..\libavformat\latmenc.c" />
     <ClCompile Include="..\libavformat\lmlm4.c" />
     <ClCompile Include="..\libavformat\loasdec.c" />
diff --git a/SMP/libavformat_winrt.vcxproj.filters b/SMP/libavformat_winrt.vcxproj.filters
index cec3f1fd79351..03585c8c46f6e 100644
--- a/SMP/libavformat_winrt.vcxproj.filters
+++ b/SMP/libavformat_winrt.vcxproj.filters
@@ -52,6 +52,9 @@
     <ClCompile Include="..\libavformat\dump.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\dv.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\format.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
@@ -304,6 +307,9 @@
     <ClCompile Include="..\libavformat\anm.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\apac.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\apc.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
@@ -436,6 +442,9 @@
     <ClCompile Include="..\libavformat\boadec.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\bonk.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\brstm.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
@@ -529,9 +538,6 @@
     <ClCompile Include="..\libavformat\dtsdec.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavformat\dv.c">
-      <Filter>Source Files\libavformat</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavformat\dvenc.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
@@ -784,6 +790,9 @@
     <ClCompile Include="..\libavformat\kvag.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\lafdec.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\latmenc.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
diff --git a/SMP/libavutil.def b/SMP/libavutil.def
index 02b32ec04ada1..f8d5d4bf1d0b1 100644
--- a/SMP/libavutil.def
+++ b/SMP/libavutil.def
@@ -94,8 +94,10 @@ EXPORTS
     av_channel_layout_uninit
     av_channel_name
     av_channel_name_bprint
+    av_chroma_location_enum_to_pos
     av_chroma_location_from_name
     av_chroma_location_name
+    av_chroma_location_pos_to_enum
     av_cmp_i
     av_color_primaries_from_name
     av_color_primaries_name
@@ -133,6 +135,7 @@ EXPORTS
     av_dict_free
     av_dict_get
     av_dict_get_string
+    av_dict_iterate
     av_dict_parse_string
     av_dict_set
     av_dict_set_int