projects: Update for required upstream merge.

SMP/SMP.patch

+diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
+index a08fe0ce76..4fb960aac9 100644
+--- a/libavcodec/libx264.c
++++ b/libavcodec/libx264.c
+@@ -30,10 +30,6 @@
+ #include "avcodec.h"
+ #include "internal.h"
+ 
+-#if defined(_MSC_VER)
+-#define X264_API_IMPORTS 1
+-#endif
+-
+ #include <x264.h>
+ #include <float.h>
+ #include <math.h>

SMP/config.asm

@@ -411,7 +411,7 @@
 %define CONFIG_MANPAGES 0
 %define CONFIG_PODPAGES 0
 %define CONFIG_TXTPAGES 0
-%define CONFIG_AVIO_DIR_CMD_EXAMPLE 0
+%define CONFIG_AVIO_LIST_DIR_EXAMPLE 0
 %define CONFIG_AVIO_READING_EXAMPLE 0
 %define CONFIG_DECODE_AUDIO_EXAMPLE 0
 %define CONFIG_DECODE_VIDEO_EXAMPLE 0
@@ -434,7 +434,7 @@
 %define CONFIG_TRANSCODING_EXAMPLE 0
 %define CONFIG_VAAPI_ENCODE_EXAMPLE 0
 %define CONFIG_VAAPI_TRANSCODE_EXAMPLE 0
-%define CONFIG_AVISYNTH 1
+%define CONFIG_AVISYNTH 0
 %define CONFIG_FREI0R 0
 %define CONFIG_LIBCDIO 1
 %define CONFIG_LIBDAVS2 0
@@ -495,6 +495,7 @@
 %define CONFIG_LIBOPENMPT 0
 %define CONFIG_LIBOPUS 1
 %define CONFIG_LIBPULSE 0
+%define CONFIG_LIBRABBITMQ 0
 %define CONFIG_LIBRAV1E 0
 %define CONFIG_LIBRSVG 0
 %define CONFIG_LIBRTMP 0
@@ -896,6 +897,7 @@
 %define CONFIG_MSVIDEO1_DECODER 1
 %define CONFIG_MSZH_DECODER 1
 %define CONFIG_MTS2_DECODER 1
+%define CONFIG_MV30_DECODER 1
 %define CONFIG_MVC1_DECODER 1
 %define CONFIG_MVC2_DECODER 1
 %define CONFIG_MVDV_DECODER 1
@@ -936,7 +938,6 @@
 %define CONFIG_SANM_DECODER 1
 %define CONFIG_SCPR_DECODER 1
 %define CONFIG_SCREENPRESSO_DECODER 1
-%define CONFIG_SDX2_DPCM_DECODER 1
 %define CONFIG_SGI_DECODER 1
 %define CONFIG_SGIRLE_DECODER 1
 %define CONFIG_SHEERVIDEO_DECODER 1
@@ -1060,6 +1061,7 @@
 %define CONFIG_G729_DECODER 1
 %define CONFIG_GSM_DECODER 1
 %define CONFIG_GSM_MS_DECODER 1
+%define CONFIG_HCA_DECODER 1
 %define CONFIG_HCOM_DECODER 1
 %define CONFIG_IAC_DECODER 1
 %define CONFIG_ILBC_DECODER 1
@@ -1094,6 +1096,7 @@
 %define CONFIG_SBC_DECODER 1
 %define CONFIG_SHORTEN_DECODER 1
 %define CONFIG_SIPR_DECODER 1
+%define CONFIG_SIREN_DECODER 1
 %define CONFIG_SMACKAUD_DECODER 1
 %define CONFIG_SONIC_DECODER 1
 %define CONFIG_TAK_DECODER 1
@@ -1146,10 +1149,11 @@
 %define CONFIG_PCM_U32BE_DECODER 1
 %define CONFIG_PCM_U32LE_DECODER 1
 %define CONFIG_PCM_VIDC_DECODER 1
-%define CONFIG_PCM_ZORK_DECODER 1
+%define CONFIG_DERF_DPCM_DECODER 1
 %define CONFIG_GREMLIN_DPCM_DECODER 1
 %define CONFIG_INTERPLAY_DPCM_DECODER 1
 %define CONFIG_ROQ_DPCM_DECODER 1
+%define CONFIG_SDX2_DPCM_DECODER 1
 %define CONFIG_SOL_DPCM_DECODER 1
 %define CONFIG_XAN_DPCM_DECODER 1
 %define CONFIG_ADPCM_4XM_DECODER 1
@@ -1170,13 +1174,16 @@
 %define CONFIG_ADPCM_G726_DECODER 1
 %define CONFIG_ADPCM_G726LE_DECODER 1
 %define CONFIG_ADPCM_IMA_AMV_DECODER 1
+%define CONFIG_ADPCM_IMA_ALP_DECODER 1
 %define CONFIG_ADPCM_IMA_APC_DECODER 1
+%define CONFIG_ADPCM_IMA_APM_DECODER 1
 %define CONFIG_ADPCM_IMA_DAT4_DECODER 1
 %define CONFIG_ADPCM_IMA_DK3_DECODER 1
 %define CONFIG_ADPCM_IMA_DK4_DECODER 1
 %define CONFIG_ADPCM_IMA_EA_EACS_DECODER 1
 %define CONFIG_ADPCM_IMA_EA_SEAD_DECODER 1
 %define CONFIG_ADPCM_IMA_ISS_DECODER 1
+%define CONFIG_ADPCM_IMA_MTF_DECODER 1
 %define CONFIG_ADPCM_IMA_OKI_DECODER 1
 %define CONFIG_ADPCM_IMA_QT_DECODER 1
 %define CONFIG_ADPCM_IMA_RAD_DECODER 1
@@ -1196,6 +1203,7 @@
 %define CONFIG_ADPCM_VIMA_DECODER 1
 %define CONFIG_ADPCM_XA_DECODER 1
 %define CONFIG_ADPCM_YAMAHA_DECODER 1
+%define CONFIG_ADPCM_ZORK_DECODER 1
 %define CONFIG_SSA_DECODER 1
 %define CONFIG_ASS_DECODER 1
 %define CONFIG_CCAPTION_DECODER 1
@@ -1764,6 +1772,7 @@
 %define CONFIG_BOXBLUR_FILTER 1
 %define CONFIG_BOXBLUR_OPENCL_FILTER 0
 %define CONFIG_BWDIF_FILTER 1
+%define CONFIG_CAS_FILTER 1
 %define CONFIG_CHROMAHOLD_FILTER 1
 %define CONFIG_CHROMAKEY_FILTER 1
 %define CONFIG_CHROMASHIFT_FILTER 1
@@ -1907,6 +1916,7 @@
 %define CONFIG_OVERLAY_OPENCL_FILTER 0
 %define CONFIG_OVERLAY_QSV_FILTER 1
 %define CONFIG_OVERLAY_VULKAN_FILTER 0
+%define CONFIG_OVERLAY_CUDA_FILTER 0
 %define CONFIG_OWDENOISE_FILTER 1
 %define CONFIG_PAD_FILTER 1
 %define CONFIG_PAD_OPENCL_FILTER 0
@@ -2087,12 +2097,14 @@
 %define CONFIG_AFC_DEMUXER 1
 %define CONFIG_AIFF_DEMUXER 1
 %define CONFIG_AIX_DEMUXER 1
+%define CONFIG_ALP_DEMUXER 1
 %define CONFIG_AMR_DEMUXER 1
 %define CONFIG_AMRNB_DEMUXER 1
 %define CONFIG_AMRWB_DEMUXER 1
 %define CONFIG_ANM_DEMUXER 1
 %define CONFIG_APC_DEMUXER 1
 %define CONFIG_APE_DEMUXER 1
+%define CONFIG_APM_DEMUXER 1
 %define CONFIG_APNG_DEMUXER 1
 %define CONFIG_APTX_DEMUXER 1
 %define CONFIG_APTX_HD_DEMUXER 1
@@ -2105,7 +2117,7 @@
 %define CONFIG_AU_DEMUXER 1
 %define CONFIG_AV1_DEMUXER 1
 %define CONFIG_AVI_DEMUXER 1
-%define CONFIG_AVISYNTH_DEMUXER 1
+%define CONFIG_AVISYNTH_DEMUXER 0
 %define CONFIG_AVR_DEMUXER 1
 %define CONFIG_AVS_DEMUXER 1
 %define CONFIG_AVS2_DEMUXER 1
@@ -2131,6 +2143,7 @@
 %define CONFIG_DATA_DEMUXER 1
 %define CONFIG_DAUD_DEMUXER 1
 %define CONFIG_DCSTR_DEMUXER 1
+%define CONFIG_DERF_DEMUXER 1
 %define CONFIG_DFA_DEMUXER 1
 %define CONFIG_DHAV_DEMUXER 1
 %define CONFIG_DIRAC_DEMUXER 1
@@ -2158,6 +2171,7 @@
 %define CONFIG_FOURXM_DEMUXER 1
 %define CONFIG_FRM_DEMUXER 1
 %define CONFIG_FSB_DEMUXER 1
+%define CONFIG_FWSE_DEMUXER 1
 %define CONFIG_G722_DEMUXER 1
 %define CONFIG_G723_1_DEMUXER 1
 %define CONFIG_G726_DEMUXER 1
@@ -2171,6 +2185,7 @@
 %define CONFIG_H261_DEMUXER 1
 %define CONFIG_H263_DEMUXER 1
 %define CONFIG_H264_DEMUXER 1
+%define CONFIG_HCA_DEMUXER 1
 %define CONFIG_HCOM_DEMUXER 1
 %define CONFIG_HEVC_DEMUXER 1
 %define CONFIG_HLS_DEMUXER 1
@@ -2579,6 +2594,7 @@
 %define CONFIG_UDP_PROTOCOL 1
 %define CONFIG_UDPLITE_PROTOCOL 1
 %define CONFIG_UNIX_PROTOCOL 0
+%define CONFIG_LIBAMQP_PROTOCOL 0
 %define CONFIG_LIBRTMP_PROTOCOL 0
 %define CONFIG_LIBRTMPE_PROTOCOL 0
 %define CONFIG_LIBRTMPS_PROTOCOL 0

SMP/config.h

@@ -25,7 +25,7 @@
 #   include <sdkddkver.h>
 #   include <winapifamily.h>
 #endif
-#define FFMPEG_CONFIGURATION "--enable-gpl --enable-version3 --enable-bzlib --enable-iconv --enable-lzma --enable-sdl2 --enable-zlib --enable-avisynth --enable-libmp3lame --enable-libvorbis --enable-libspeex --enable-libopus --enable-libilbc --enable-libtheora --enable-libx264 --enable-libx265 --enable-libxvid --enable-libvpx --enable-libgme --enable-libmodplug --enable-libsoxr --enable-libfreetype --enable-fontconfig --enable-libfribidi --enable-libass --enable-libxml2 --enable-gnutls --disable-schannel --enable-gcrypt --enable-libssh --enable-libcdio --enable-libbluray --enable-opengl --enable-libmfx --enable-ffnvcodec --enable-cuda --enable-amf --toolchain=msvc"
+#define FFMPEG_CONFIGURATION "--enable-gpl --enable-version3 --enable-bzlib --enable-iconv --enable-lzma --enable-sdl2 --enable-zlib --enable-libmp3lame --enable-libvorbis --enable-libspeex --enable-libopus --enable-libilbc --enable-libtheora --enable-libx264 --enable-libx265 --enable-libxvid --enable-libvpx --enable-libgme --enable-libmodplug --enable-libsoxr --enable-libfreetype --enable-fontconfig --enable-libfribidi --enable-libass --enable-libxml2 --enable-gnutls --disable-schannel --enable-gcrypt --enable-libssh --enable-libcdio --enable-libbluray --enable-opengl --enable-libmfx --enable-ffnvcodec --enable-cuda --enable-amf --toolchain=msvc"
 #define FFMPEG_LICENSE "GPL version 3 or later"
 #define CONFIG_THIS_YEAR 2020
 #define FFMPEG_DATADIR "."
@@ -469,7 +469,7 @@
 #define CONFIG_MANPAGES 0
 #define CONFIG_PODPAGES 0
 #define CONFIG_TXTPAGES 0
-#define CONFIG_AVIO_DIR_CMD_EXAMPLE 0
+#define CONFIG_AVIO_LIST_DIR_EXAMPLE 0
 #define CONFIG_AVIO_READING_EXAMPLE 0
 #define CONFIG_DECODE_AUDIO_EXAMPLE 0
 #define CONFIG_DECODE_VIDEO_EXAMPLE 0
@@ -492,7 +492,7 @@
 #define CONFIG_TRANSCODING_EXAMPLE 0
 #define CONFIG_VAAPI_ENCODE_EXAMPLE 0
 #define CONFIG_VAAPI_TRANSCODE_EXAMPLE 0
-#define CONFIG_AVISYNTH 1
+#define CONFIG_AVISYNTH 0
 #define CONFIG_FREI0R 0
 #define CONFIG_LIBCDIO 1
 #define CONFIG_LIBDAVS2 0
@@ -553,6 +553,7 @@
 #define CONFIG_LIBOPENMPT 0
 #define CONFIG_LIBOPUS 1
 #define CONFIG_LIBPULSE 0
+#define CONFIG_LIBRABBITMQ 0
 #define CONFIG_LIBRAV1E 0
 #define CONFIG_LIBRSVG 0
 #define CONFIG_LIBRTMP 0
@@ -966,6 +967,7 @@
 #define CONFIG_MSVIDEO1_DECODER 1
 #define CONFIG_MSZH_DECODER 1
 #define CONFIG_MTS2_DECODER 1
+#define CONFIG_MV30_DECODER 1
 #define CONFIG_MVC1_DECODER 1
 #define CONFIG_MVC2_DECODER 1
 #define CONFIG_MVDV_DECODER 1
@@ -1006,7 +1008,6 @@
 #define CONFIG_SANM_DECODER 1
 #define CONFIG_SCPR_DECODER 1
 #define CONFIG_SCREENPRESSO_DECODER 1
-#define CONFIG_SDX2_DPCM_DECODER 1
 #define CONFIG_SGI_DECODER 1
 #define CONFIG_SGIRLE_DECODER 1
 #define CONFIG_SHEERVIDEO_DECODER 1
@@ -1130,6 +1131,7 @@
 #define CONFIG_G729_DECODER 1
 #define CONFIG_GSM_DECODER 1
 #define CONFIG_GSM_MS_DECODER 1
+#define CONFIG_HCA_DECODER 1
 #define CONFIG_HCOM_DECODER 1
 #define CONFIG_IAC_DECODER 1
 #define CONFIG_ILBC_DECODER 1
@@ -1164,6 +1166,7 @@
 #define CONFIG_SBC_DECODER 1
 #define CONFIG_SHORTEN_DECODER 1
 #define CONFIG_SIPR_DECODER 1
+#define CONFIG_SIREN_DECODER 1
 #define CONFIG_SMACKAUD_DECODER 1
 #define CONFIG_SONIC_DECODER 1
 #define CONFIG_TAK_DECODER 1
@@ -1216,10 +1219,11 @@
 #define CONFIG_PCM_U32BE_DECODER 1
 #define CONFIG_PCM_U32LE_DECODER 1
 #define CONFIG_PCM_VIDC_DECODER 1
-#define CONFIG_PCM_ZORK_DECODER 1
+#define CONFIG_DERF_DPCM_DECODER 1
 #define CONFIG_GREMLIN_DPCM_DECODER 1
 #define CONFIG_INTERPLAY_DPCM_DECODER 1
 #define CONFIG_ROQ_DPCM_DECODER 1
+#define CONFIG_SDX2_DPCM_DECODER 1
 #define CONFIG_SOL_DPCM_DECODER 1
 #define CONFIG_XAN_DPCM_DECODER 1
 #define CONFIG_ADPCM_4XM_DECODER 1
@@ -1240,13 +1244,16 @@
 #define CONFIG_ADPCM_G726_DECODER 1
 #define CONFIG_ADPCM_G726LE_DECODER 1
 #define CONFIG_ADPCM_IMA_AMV_DECODER 1
+#define CONFIG_ADPCM_IMA_ALP_DECODER 1
 #define CONFIG_ADPCM_IMA_APC_DECODER 1
+#define CONFIG_ADPCM_IMA_APM_DECODER 1
 #define CONFIG_ADPCM_IMA_DAT4_DECODER 1
 #define CONFIG_ADPCM_IMA_DK3_DECODER 1
 #define CONFIG_ADPCM_IMA_DK4_DECODER 1
 #define CONFIG_ADPCM_IMA_EA_EACS_DECODER 1
 #define CONFIG_ADPCM_IMA_EA_SEAD_DECODER 1
 #define CONFIG_ADPCM_IMA_ISS_DECODER 1
+#define CONFIG_ADPCM_IMA_MTF_DECODER 1
 #define CONFIG_ADPCM_IMA_OKI_DECODER 1
 #define CONFIG_ADPCM_IMA_QT_DECODER 1
 #define CONFIG_ADPCM_IMA_RAD_DECODER 1
@@ -1266,6 +1273,7 @@
 #define CONFIG_ADPCM_VIMA_DECODER 1
 #define CONFIG_ADPCM_XA_DECODER 1
 #define CONFIG_ADPCM_YAMAHA_DECODER 1
+#define CONFIG_ADPCM_ZORK_DECODER 1
 #define CONFIG_SSA_DECODER 1
 #define CONFIG_ASS_DECODER 1
 #define CONFIG_CCAPTION_DECODER 1
@@ -1886,6 +1894,7 @@
 #define CONFIG_BOXBLUR_FILTER 1
 #define CONFIG_BOXBLUR_OPENCL_FILTER 0
 #define CONFIG_BWDIF_FILTER 1
+#define CONFIG_CAS_FILTER 1
 #define CONFIG_CHROMAHOLD_FILTER 1
 #define CONFIG_CHROMAKEY_FILTER 1
 #define CONFIG_CHROMASHIFT_FILTER 1
@@ -2029,6 +2038,7 @@
 #define CONFIG_OVERLAY_OPENCL_FILTER 0
 #define CONFIG_OVERLAY_QSV_FILTER 1
 #define CONFIG_OVERLAY_VULKAN_FILTER 0
+#define CONFIG_OVERLAY_CUDA_FILTER 0
 #define CONFIG_OWDENOISE_FILTER 1
 #define CONFIG_PAD_FILTER 1
 #define CONFIG_PAD_OPENCL_FILTER 0
@@ -2209,12 +2219,14 @@
 #define CONFIG_AFC_DEMUXER 1
 #define CONFIG_AIFF_DEMUXER 1
 #define CONFIG_AIX_DEMUXER 1
+#define CONFIG_ALP_DEMUXER 1
 #define CONFIG_AMR_DEMUXER 1
 #define CONFIG_AMRNB_DEMUXER 1
 #define CONFIG_AMRWB_DEMUXER 1
 #define CONFIG_ANM_DEMUXER 1
 #define CONFIG_APC_DEMUXER 1
 #define CONFIG_APE_DEMUXER 1
+#define CONFIG_APM_DEMUXER 1
 #define CONFIG_APNG_DEMUXER 1
 #define CONFIG_APTX_DEMUXER 1
 #define CONFIG_APTX_HD_DEMUXER 1
@@ -2227,7 +2239,7 @@
 #define CONFIG_AU_DEMUXER 1
 #define CONFIG_AV1_DEMUXER 1
 #define CONFIG_AVI_DEMUXER 1
-#define CONFIG_AVISYNTH_DEMUXER 1
+#define CONFIG_AVISYNTH_DEMUXER 0
 #define CONFIG_AVR_DEMUXER 1
 #define CONFIG_AVS_DEMUXER 1
 #define CONFIG_AVS2_DEMUXER 1
@@ -2253,6 +2265,7 @@
 #define CONFIG_DATA_DEMUXER 1
 #define CONFIG_DAUD_DEMUXER 1
 #define CONFIG_DCSTR_DEMUXER 1
+#define CONFIG_DERF_DEMUXER 1
 #define CONFIG_DFA_DEMUXER 1
 #define CONFIG_DHAV_DEMUXER 1
 #define CONFIG_DIRAC_DEMUXER 1
@@ -2280,6 +2293,7 @@
 #define CONFIG_FOURXM_DEMUXER 1
 #define CONFIG_FRM_DEMUXER 1
 #define CONFIG_FSB_DEMUXER 1
+#define CONFIG_FWSE_DEMUXER 1
 #define CONFIG_G722_DEMUXER 1
 #define CONFIG_G723_1_DEMUXER 1
 #define CONFIG_G726_DEMUXER 1
@@ -2293,6 +2307,7 @@
 #define CONFIG_H261_DEMUXER 1
 #define CONFIG_H263_DEMUXER 1
 #define CONFIG_H264_DEMUXER 1
+#define CONFIG_HCA_DEMUXER 1
 #define CONFIG_HCOM_DEMUXER 1
 #define CONFIG_HEVC_DEMUXER 1
 #define CONFIG_HLS_DEMUXER 1
@@ -2701,6 +2716,7 @@
 #define CONFIG_UDP_PROTOCOL 1
 #define CONFIG_UDPLITE_PROTOCOL 1
 #define CONFIG_UNIX_PROTOCOL 0
+#define CONFIG_LIBAMQP_PROTOCOL 0
 #define CONFIG_LIBRTMP_PROTOCOL 0
 #define CONFIG_LIBRTMPE_PROTOCOL 0
 #define CONFIG_LIBRTMPS_PROTOCOL 0

SMP/ffmpeg.vcxproj

@@ -38,7 +38,6 @@
     <ClCompile Include="..\fftools\ffmpeg_opt.c" />
     <ClCompile Include="..\fftools\ffmpeg_filter.c" />
     <ClCompile Include="..\fftools\ffmpeg_hw.c" />
-    <ClCompile Include="..\fftools\ffmpeg_cuvid.c" />
     <ClCompile Include="..\fftools\ffmpeg_qsv.c" />
     <ClCompile Include="..\fftools\cmdutils.c" />
     <ClCompile Include="..\fftools\ffmpeg.c" />

SMP/ffmpeg.vcxproj.filters

@@ -30,9 +30,6 @@
     <ClCompile Include="..\fftools\ffmpeg_hw.c">
       <Filter>Source Files\fftools</Filter>
     </ClCompile>
-    <ClCompile Include="..\fftools\ffmpeg_cuvid.c">
-      <Filter>Source Files\fftools</Filter>
-    </ClCompile>
     <ClCompile Include="..\fftools\ffmpeg_qsv.c">
       <Filter>Source Files\fftools</Filter>
     </ClCompile>

SMP/libavcodec.vcxproj

@@ -416,6 +416,7 @@
     <ClCompile Include="..\libavcodec\dcaenc.c" />
     <ClCompile Include="..\libavcodec\dcaadpcm.c" />
     <ClCompile Include="..\libavcodec\dds.c" />
+    <ClCompile Include="..\libavcodec\dpcm.c" />
     <ClCompile Include="..\libavcodec\diracdec.c" />
     <ClCompile Include="..\libavcodec\diractab.c" />
     <ClCompile Include="..\libavcodec\dirac_arith.c" />
@@ -491,7 +492,6 @@
     <ClCompile Include="..\libavcodec\lzw.c" />
     <ClCompile Include="..\libavcodec\gif.c" />
     <ClCompile Include="..\libavcodec\lzwenc.c" />
-    <ClCompile Include="..\libavcodec\dpcm.c" />
     <ClCompile Include="..\libavcodec\gsmdec.c" />
     <ClCompile Include="..\libavcodec\gsmdec_data.c" />
     <ClCompile Include="..\libavcodec\msgsmdec.c" />
@@ -528,6 +528,7 @@
     <ClCompile Include="..\libavcodec\qsvenc_h264.c" />
     <ClCompile Include="..\libavcodec\hapdec.c" />
     <ClCompile Include="..\libavcodec\hap.c" />
+    <ClCompile Include="..\libavcodec\hcadec.c" />
     <ClCompile Include="..\libavcodec\hcom.c" />
     <ClCompile Include="..\libavcodec\hevcdec.c" />
     <ClCompile Include="..\libavcodec\hevc_mvs.c" />
@@ -628,6 +629,7 @@
     <ClCompile Include="..\libavcodec\msvideo1enc.c" />
     <ClCompile Include="..\libavcodec\lcldec.c" />
     <ClCompile Include="..\libavcodec\mss4.c" />
+    <ClCompile Include="..\libavcodec\mv30.c" />
     <ClCompile Include="..\libavcodec\mvcdec.c" />
     <ClCompile Include="..\libavcodec\midivid.c" />
     <ClCompile Include="..\libavcodec\mvha.c" />
@@ -713,6 +715,7 @@
     <ClCompile Include="..\libavcodec\shorten.c" />
     <ClCompile Include="..\libavcodec\sipr.c" />
     <ClCompile Include="..\libavcodec\sipr16k.c" />
+    <ClCompile Include="..\libavcodec\siren.c" />
     <ClCompile Include="..\libavcodec\smacker.c" />
     <ClCompile Include="..\libavcodec\smc.c" />
     <ClCompile Include="..\libavcodec\smvjpegdec.c" />
@@ -735,7 +738,6 @@
     <ClCompile Include="..\libavcodec\sbcdsp_data.c" />
     <ClCompile Include="..\libavcodec\svq1dec.c" />
     <ClCompile Include="..\libavcodec\svq1.c" />
-    <ClCompile Include="..\libavcodec\svq13.c" />
     <ClCompile Include="..\libavcodec\svq3.c" />
     <ClCompile Include="..\libavcodec\takdec.c" />
     <ClCompile Include="..\libavcodec\tak.c" />
@@ -926,10 +928,10 @@
     <ClCompile Include="..\libavcodec\mlp_parse.c" />
     <ClCompile Include="..\libavcodec\mlp_parser.c" />
     <ClCompile Include="..\libavcodec\mpeg4video_parser.c" />
-    <ClCompile Include="..\libavcodec\png_parser.c" />
     <ClCompile Include="..\libavcodec\mpegaudio_parser.c" />
     <ClCompile Include="..\libavcodec\mpegvideo_parser.c" />
     <ClCompile Include="..\libavcodec\opus_parser.c" />
+    <ClCompile Include="..\libavcodec\png_parser.c" />
     <ClCompile Include="..\libavcodec\pnm_parser.c" />
     <ClCompile Include="..\libavcodec\rv34_parser.c" />
     <ClCompile Include="..\libavcodec\sbc_parser.c" />
@@ -1224,12 +1226,15 @@
     <ClInclude Include="..\libavcodec\avcodec.h" />
     <ClInclude Include="..\libavcodec\avdct.h" />
     <ClInclude Include="..\libavcodec\avfft.h" />
+    <ClInclude Include="..\libavcodec\codec_desc.h" />
+    <ClInclude Include="..\libavcodec\codec_id.h" />
     <ClInclude Include="..\libavcodec\d3d11va.h" />
     <ClInclude Include="..\libavcodec\dirac.h" />
     <ClInclude Include="..\libavcodec\dv_profile.h" />
     <ClInclude Include="..\libavcodec\dxva2.h" />
     <ClInclude Include="..\libavcodec\jni.h" />
     <ClInclude Include="..\libavcodec\mediacodec.h" />
+    <ClInclude Include="..\libavcodec\packet.h" />
     <ClInclude Include="..\libavcodec\qsv.h" />
     <ClInclude Include="..\libavcodec\vaapi.h" />
     <ClInclude Include="..\libavcodec\vdpau.h" />
@@ -1465,12 +1470,15 @@ copy ..\libavcodec\adts_parser.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avcodec.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avdct.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avfft.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\d3d11va.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dirac.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dv_profile.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dxva2.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\jni.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\mediacodec.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\packet.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\qsv.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\vaapi.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\vdpau.h "$(OutDir)"\include\libavcodec
@@ -1548,12 +1556,15 @@ copy ..\libavcodec\adts_parser.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avcodec.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avdct.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avfft.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\d3d11va.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dirac.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dv_profile.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dxva2.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\jni.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\mediacodec.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\packet.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\qsv.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\vaapi.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\vdpau.h "$(OutDir)"\include\libavcodec
@@ -1638,12 +1649,15 @@ copy ..\libavcodec\adts_parser.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avcodec.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avdct.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avfft.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\d3d11va.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dirac.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dv_profile.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dxva2.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\jni.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\mediacodec.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\packet.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\qsv.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\vaapi.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\vdpau.h "$(OutDir)"\include\libavcodec
@@ -1726,12 +1740,15 @@ copy ..\libavcodec\adts_parser.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avcodec.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avdct.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avfft.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\d3d11va.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dirac.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dv_profile.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dxva2.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\jni.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\mediacodec.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\packet.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\qsv.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\vaapi.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\vdpau.h "$(OutDir)"\include\libavcodec
@@ -1815,12 +1832,15 @@ copy ..\libavcodec\adts_parser.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avcodec.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avdct.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avfft.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\d3d11va.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dirac.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dv_profile.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dxva2.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\jni.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\mediacodec.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\packet.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\qsv.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\vaapi.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\vdpau.h "$(OutDir)"\include\libavcodec
@@ -1902,12 +1922,15 @@ copy ..\libavcodec\adts_parser.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avcodec.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avdct.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avfft.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\d3d11va.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dirac.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dv_profile.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dxva2.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\jni.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\mediacodec.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\packet.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\qsv.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\vaapi.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\vdpau.h "$(OutDir)"\include\libavcodec
@@ -1997,12 +2020,15 @@ copy ..\libavcodec\adts_parser.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avcodec.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avdct.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avfft.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\d3d11va.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dirac.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dv_profile.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dxva2.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\jni.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\mediacodec.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\packet.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\qsv.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\vaapi.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\vdpau.h "$(OutDir)"\include\libavcodec
@@ -2091,12 +2117,15 @@ copy ..\libavcodec\adts_parser.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avcodec.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avdct.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avfft.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\d3d11va.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dirac.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dv_profile.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dxva2.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\jni.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\mediacodec.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\packet.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\qsv.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\vaapi.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\vdpau.h "$(OutDir)"\include\libavcodec
@@ -2186,12 +2215,15 @@ copy ..\libavcodec\adts_parser.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avcodec.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avdct.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avfft.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\d3d11va.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dirac.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dv_profile.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dxva2.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\jni.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\mediacodec.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\packet.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\qsv.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\vaapi.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\vdpau.h "$(OutDir)"\include\libavcodec
@@ -2280,12 +2312,15 @@ copy ..\libavcodec\adts_parser.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avcodec.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avdct.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avfft.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\d3d11va.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dirac.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dv_profile.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dxva2.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\jni.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\mediacodec.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\packet.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\qsv.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\vaapi.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\vdpau.h "$(OutDir)"\include\libavcodec

SMP/libavcodec.vcxproj.filters

@@ -1098,6 +1098,9 @@
     <ClCompile Include="..\libavcodec\dds.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\dpcm.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\diracdec.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -1323,9 +1326,6 @@
     <ClCompile Include="..\libavcodec\lzwenc.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\dpcm.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavcodec\gsmdec.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -1434,6 +1434,9 @@
     <ClCompile Include="..\libavcodec\hap.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\hcadec.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\hcom.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -1734,6 +1737,9 @@
     <ClCompile Include="..\libavcodec\mss4.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\mv30.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\mvcdec.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -1989,6 +1995,9 @@
     <ClCompile Include="..\libavcodec\sipr16k.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\siren.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\smacker.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -2055,9 +2064,6 @@
     <ClCompile Include="..\libavcodec\svq1.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\svq13.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavcodec\svq3.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -2628,9 +2634,6 @@
     <ClCompile Include="..\libavcodec\mpeg4video_parser.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\png_parser.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavcodec\mpegaudio_parser.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -2640,6 +2643,9 @@
     <ClCompile Include="..\libavcodec\opus_parser.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\png_parser.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\pnm_parser.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -3194,6 +3200,12 @@
     <ClInclude Include="..\libavcodec\avfft.h">
       <Filter>Header Files\libavcodec</Filter>
     </ClInclude>
+    <ClInclude Include="..\libavcodec\codec_desc.h">
+      <Filter>Header Files\libavcodec</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libavcodec\codec_id.h">
+      <Filter>Header Files\libavcodec</Filter>
+    </ClInclude>
     <ClInclude Include="..\libavcodec\d3d11va.h">
       <Filter>Header Files\libavcodec</Filter>
     </ClInclude>
@@ -3212,6 +3224,9 @@
     <ClInclude Include="..\libavcodec\mediacodec.h">
       <Filter>Header Files\libavcodec</Filter>
     </ClInclude>
+    <ClInclude Include="..\libavcodec\packet.h">
+      <Filter>Header Files\libavcodec</Filter>
+    </ClInclude>
     <ClInclude Include="..\libavcodec\qsv.h">
       <Filter>Header Files\libavcodec</Filter>
     </ClInclude>

SMP/libavcodec/codec_list.c

@@ -328,6 +328,7 @@ static const AVCodec *codec_list[] = {
     &ff_msvideo1_decoder,
     &ff_mszh_decoder,
     &ff_mts2_decoder,
+    &ff_mv30_decoder,
     &ff_mvc1_decoder,
     &ff_mvc2_decoder,
     &ff_mvdv_decoder,
@@ -368,7 +369,6 @@ static const AVCodec *codec_list[] = {
     &ff_sanm_decoder,
     &ff_scpr_decoder,
     &ff_screenpresso_decoder,
-    &ff_sdx2_dpcm_decoder,
     &ff_sgi_decoder,
     &ff_sgirle_decoder,
     &ff_sheervideo_decoder,
@@ -484,6 +484,7 @@ static const AVCodec *codec_list[] = {
     &ff_g729_decoder,
     &ff_gsm_decoder,
     &ff_gsm_ms_decoder,
+    &ff_hca_decoder,
     &ff_hcom_decoder,
     &ff_iac_decoder,
     &ff_ilbc_decoder,
@@ -518,6 +519,7 @@ static const AVCodec *codec_list[] = {
     &ff_sbc_decoder,
     &ff_shorten_decoder,
     &ff_sipr_decoder,
+    &ff_siren_decoder,
     &ff_smackaud_decoder,
     &ff_sonic_decoder,
     &ff_tak_decoder,
@@ -570,10 +572,11 @@ static const AVCodec *codec_list[] = {
     &ff_pcm_u32be_decoder,
     &ff_pcm_u32le_decoder,
     &ff_pcm_vidc_decoder,
-    &ff_pcm_zork_decoder,
+    &ff_derf_dpcm_decoder,
     &ff_gremlin_dpcm_decoder,
     &ff_interplay_dpcm_decoder,
     &ff_roq_dpcm_decoder,
+    &ff_sdx2_dpcm_decoder,
     &ff_sol_dpcm_decoder,
     &ff_xan_dpcm_decoder,
     &ff_adpcm_4xm_decoder,
@@ -594,13 +597,16 @@ static const AVCodec *codec_list[] = {
     &ff_adpcm_g726_decoder,
     &ff_adpcm_g726le_decoder,
     &ff_adpcm_ima_amv_decoder,
+    &ff_adpcm_ima_alp_decoder,
     &ff_adpcm_ima_apc_decoder,
+    &ff_adpcm_ima_apm_decoder,
     &ff_adpcm_ima_dat4_decoder,
     &ff_adpcm_ima_dk3_decoder,
     &ff_adpcm_ima_dk4_decoder,
     &ff_adpcm_ima_ea_eacs_decoder,
     &ff_adpcm_ima_ea_sead_decoder,
     &ff_adpcm_ima_iss_decoder,
+    &ff_adpcm_ima_mtf_decoder,
     &ff_adpcm_ima_oki_decoder,
     &ff_adpcm_ima_qt_decoder,
     &ff_adpcm_ima_rad_decoder,
@@ -620,6 +626,7 @@ static const AVCodec *codec_list[] = {
     &ff_adpcm_vima_decoder,
     &ff_adpcm_xa_decoder,
     &ff_adpcm_yamaha_decoder,
+    &ff_adpcm_zork_decoder,
     &ff_ssa_decoder,
     &ff_ass_decoder,
     &ff_ccaption_decoder,

SMP/libavfilter.vcxproj

@@ -227,6 +227,7 @@
     <ClCompile Include="..\libavfilter\vf_boxblur.c" />
     <ClCompile Include="..\libavfilter\boxblur.c" />
     <ClCompile Include="..\libavfilter\yadif_common.c" />
+    <ClCompile Include="..\libavfilter\vf_cas.c" />
     <ClCompile Include="..\libavfilter\vf_chromakey.c" />
     <ClCompile Include="..\libavfilter\vf_chromashift.c" />
     <ClCompile Include="..\libavfilter\vf_ciescope.c" />
@@ -412,6 +413,7 @@
     <ClCompile Include="..\libavfilter\dnn\dnn_backend_native_layer_conv2d.c" />
     <ClCompile Include="..\libavfilter\dnn\dnn_backend_native_layer_depth2space.c" />
     <ClCompile Include="..\libavfilter\dnn\dnn_backend_native_layer_maximum.c" />
+    <ClCompile Include="..\libavfilter\dnn\dnn_backend_native_layer_mathbinary.c" />
     <ClCompile Include="..\libavfilter\x86\scene_sad_init.c" />
     <ClCompile Include="..\libavfilter\x86\af_afir_init.c" />
     <ClCompile Include="..\libavfilter\x86\af_anlmdn_init.c" />

SMP/libavfilter.vcxproj.filters

@@ -534,6 +534,9 @@
     <ClCompile Include="..\libavfilter\yadif_common.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_cas.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_chromakey.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -1089,6 +1092,9 @@
     <ClCompile Include="..\libavfilter\dnn\dnn_backend_native_layer_maximum.c">
       <Filter>Source Files\libavfilter\dnn</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\dnn\dnn_backend_native_layer_mathbinary.c">
+      <Filter>Source Files\libavfilter\dnn</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\x86\scene_sad_init.c">
       <Filter>Source Files\libavfilter\x86</Filter>
     </ClCompile>

SMP/libavfilter/filter_list.c

@@ -148,6 +148,7 @@ static const AVFilter *filter_list[] = {
     &ff_vf_bm3d,
     &ff_vf_boxblur,
     &ff_vf_bwdif,
+    &ff_vf_cas,
     &ff_vf_chromahold,
     &ff_vf_chromakey,
     &ff_vf_chromashift,

SMP/libavformat.vcxproj

@@ -139,10 +139,12 @@
     <ClCompile Include="..\libavformat\replaygain.c" />
     <ClCompile Include="..\libavformat\aiffenc.c" />
     <ClCompile Include="..\libavformat\aixdec.c" />
+    <ClCompile Include="..\libavformat\alp.c" />
     <ClCompile Include="..\libavformat\amr.c" />
     <ClCompile Include="..\libavformat\anm.c" />
     <ClCompile Include="..\libavformat\apc.c" />
     <ClCompile Include="..\libavformat\ape.c" />
+    <ClCompile Include="..\libavformat\apm.c" />
     <ClCompile Include="..\libavformat\apngdec.c" />
     <ClCompile Include="..\libavformat\apngenc.c" />
     <ClCompile Include="..\libavformat\aptxdec.c" />
@@ -199,6 +201,7 @@
     <ClCompile Include="..\libavformat\dauddec.c" />
     <ClCompile Include="..\libavformat\daudenc.c" />
     <ClCompile Include="..\libavformat\dcstr.c" />
+    <ClCompile Include="..\libavformat\derf.c" />
     <ClCompile Include="..\libavformat\dfa.c" />
     <ClCompile Include="..\libavformat\dhav.c" />
     <ClCompile Include="..\libavformat\diracdec.c" />
@@ -240,6 +243,7 @@
     <ClCompile Include="..\libavformat\hashenc.c" />
     <ClCompile Include="..\libavformat\frmdec.c" />
     <ClCompile Include="..\libavformat\fsb.c" />
+    <ClCompile Include="..\libavformat\fwse.c" />
     <ClCompile Include="..\libavformat\gif.c" />
     <ClCompile Include="..\libavformat\gifdec.c" />
     <ClCompile Include="..\libavformat\gsmdec.c" />
@@ -255,6 +259,7 @@
     <ClCompile Include="..\libavformat\h261dec.c" />
     <ClCompile Include="..\libavformat\h263dec.c" />
     <ClCompile Include="..\libavformat\h264dec.c" />
+    <ClCompile Include="..\libavformat\hca.c" />
     <ClCompile Include="..\libavformat\hcom.c" />
     <ClCompile Include="..\libavformat\hdsenc.c" />
     <ClCompile Include="..\libavformat\hevcdec.c" />
@@ -495,7 +500,6 @@
     <ClCompile Include="..\libavformat\yop.c" />
     <ClCompile Include="..\libavformat\yuv4mpegdec.c" />
     <ClCompile Include="..\libavformat\yuv4mpegenc.c" />
-    <ClCompile Include="..\libavformat\avisynth.c" />
     <ClCompile Include="..\libavformat\libgme.c" />
     <ClCompile Include="..\libavformat\libmodplug.c" />
     <ClCompile Include="..\libavformat\async.c" />

SMP/libavformat.vcxproj.filters

@@ -268,6 +268,9 @@
     <ClCompile Include="..\libavformat\aixdec.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\alp.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\amr.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
@@ -280,6 +283,9 @@
     <ClCompile Include="..\libavformat\ape.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\apm.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\apngdec.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
@@ -448,6 +454,9 @@
     <ClCompile Include="..\libavformat\dcstr.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\derf.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\dfa.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
@@ -571,6 +580,9 @@
     <ClCompile Include="..\libavformat\fsb.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\fwse.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\gif.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
@@ -616,6 +628,9 @@
     <ClCompile Include="..\libavformat\h264dec.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\hca.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\hcom.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
@@ -1336,9 +1351,6 @@
     <ClCompile Include="..\libavformat\yuv4mpegenc.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavformat\avisynth.c">
-      <Filter>Source Files\libavformat</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavformat\libgme.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>

SMP/libavformat/demuxer_list.c

@@ -32,12 +32,14 @@ static const AVInputFormat *demuxer_list[] = {
     &ff_afc_demuxer,
     &ff_aiff_demuxer,
     &ff_aix_demuxer,
+    &ff_alp_demuxer,
     &ff_amr_demuxer,
     &ff_amrnb_demuxer,
     &ff_amrwb_demuxer,
     &ff_anm_demuxer,
     &ff_apc_demuxer,
     &ff_ape_demuxer,
+    &ff_apm_demuxer,
     &ff_apng_demuxer,
     &ff_aptx_demuxer,
     &ff_aptx_hd_demuxer,
@@ -50,7 +52,6 @@ static const AVInputFormat *demuxer_list[] = {
     &ff_au_demuxer,
     &ff_av1_demuxer,
     &ff_avi_demuxer,
-    &ff_avisynth_demuxer,
     &ff_avr_demuxer,
     &ff_avs_demuxer,
     &ff_avs2_demuxer,
@@ -76,6 +77,7 @@ static const AVInputFormat *demuxer_list[] = {
     &ff_data_demuxer,
     &ff_daud_demuxer,
     &ff_dcstr_demuxer,
+    &ff_derf_demuxer,
     &ff_dfa_demuxer,
     &ff_dhav_demuxer,
     &ff_dirac_demuxer,
@@ -103,6 +105,7 @@ static const AVInputFormat *demuxer_list[] = {
     &ff_fourxm_demuxer,
     &ff_frm_demuxer,
     &ff_fsb_demuxer,
+    &ff_fwse_demuxer,
     &ff_g722_demuxer,
     &ff_g723_1_demuxer,
     &ff_g726_demuxer,
@@ -116,6 +119,7 @@ static const AVInputFormat *demuxer_list[] = {
     &ff_h261_demuxer,
     &ff_h263_demuxer,
     &ff_h264_demuxer,
+    &ff_hca_demuxer,
     &ff_hcom_demuxer,
     &ff_hevc_demuxer,
     &ff_hls_demuxer,

SMP/libavutil.vcxproj

@@ -210,6 +210,7 @@
     <ClInclude Include="..\libavutil\hwcontext_dxva2.h" />
     <ClInclude Include="..\libavutil\hwcontext_qsv.h" />
     <ClInclude Include="..\libavutil\hwcontext_mediacodec.h" />
+    <ClInclude Include="..\libavutil\hwcontext_opencl.h" />
     <ClInclude Include="..\libavutil\hwcontext_vaapi.h" />
     <ClInclude Include="..\libavutil\hwcontext_videotoolbox.h" />
     <ClInclude Include="..\libavutil\hwcontext_vdpau.h" />
@@ -516,6 +517,7 @@ copy ..\libavutil\hwcontext_drm.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_dxva2.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_qsv.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_mediacodec.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\hwcontext_opencl.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_vaapi.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_videotoolbox.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_vdpau.h "$(OutDir)"\include\libavutil
@@ -664,6 +666,7 @@ copy ..\libavutil\hwcontext_drm.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_dxva2.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_qsv.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_mediacodec.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\hwcontext_opencl.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_vaapi.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_videotoolbox.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_vdpau.h "$(OutDir)"\include\libavutil
@@ -819,6 +822,7 @@ copy ..\libavutil\hwcontext_drm.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_dxva2.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_qsv.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_mediacodec.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\hwcontext_opencl.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_vaapi.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_videotoolbox.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_vdpau.h "$(OutDir)"\include\libavutil
@@ -972,6 +976,7 @@ copy ..\libavutil\hwcontext_drm.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_dxva2.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_qsv.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_mediacodec.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\hwcontext_opencl.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_vaapi.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_videotoolbox.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_vdpau.h "$(OutDir)"\include\libavutil
@@ -1126,6 +1131,7 @@ copy ..\libavutil\hwcontext_drm.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_dxva2.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_qsv.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_mediacodec.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\hwcontext_opencl.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_vaapi.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_videotoolbox.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_vdpau.h "$(OutDir)"\include\libavutil
@@ -1278,6 +1284,7 @@ copy ..\libavutil\hwcontext_drm.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_dxva2.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_qsv.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_mediacodec.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\hwcontext_opencl.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_vaapi.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_videotoolbox.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_vdpau.h "$(OutDir)"\include\libavutil
@@ -1438,6 +1445,7 @@ copy ..\libavutil\hwcontext_drm.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_dxva2.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_qsv.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_mediacodec.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\hwcontext_opencl.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_vaapi.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_videotoolbox.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_vdpau.h "$(OutDir)"\include\libavutil
@@ -1597,6 +1605,7 @@ copy ..\libavutil\hwcontext_drm.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_dxva2.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_qsv.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_mediacodec.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\hwcontext_opencl.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_vaapi.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_videotoolbox.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_vdpau.h "$(OutDir)"\include\libavutil
@@ -1757,6 +1766,7 @@ copy ..\libavutil\hwcontext_drm.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_dxva2.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_qsv.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_mediacodec.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\hwcontext_opencl.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_vaapi.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_videotoolbox.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_vdpau.h "$(OutDir)"\include\libavutil
@@ -1916,6 +1926,7 @@ copy ..\libavutil\hwcontext_drm.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_dxva2.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_qsv.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_mediacodec.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\hwcontext_opencl.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_vaapi.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_videotoolbox.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\hwcontext_vdpau.h "$(OutDir)"\include\libavutil

SMP/libavutil.vcxproj.filters

@@ -446,6 +446,9 @@
     <ClInclude Include="..\libavutil\hwcontext_mediacodec.h">
       <Filter>Header Files\libavutil</Filter>
     </ClInclude>
+    <ClInclude Include="..\libavutil\hwcontext_opencl.h">
+      <Filter>Header Files\libavutil</Filter>
+    </ClInclude>
     <ClInclude Include="..\libavutil\hwcontext_vaapi.h">
       <Filter>Header Files\libavutil</Filter>
     </ClInclude>