projects: Update for recent upstream merge.

SMP/config.asm

@@ -512,6 +512,7 @@
 %define CONFIG_LIBTESSERACT 0
 %define CONFIG_LIBTHEORA 1
 %define CONFIG_LIBTWOLAME 0
+%define CONFIG_LIBUAVS3D 0
 %define CONFIG_LIBV4L2 0
 %define CONFIG_LIBVMAF 0
 %define CONFIG_LIBVORBIS 1
@@ -793,6 +794,7 @@
 %define CONFIG_CLLC_DECODER 1
 %define CONFIG_COMFORTNOISE_DECODER 1
 %define CONFIG_CPIA_DECODER 1
+%define CONFIG_CRI_DECODER 1
 %define CONFIG_CSCD_DECODER 1
 %define CONFIG_CYUV_DECODER 1
 %define CONFIG_DDS_DECODER 1
@@ -900,6 +902,7 @@
 %define CONFIG_MSMPEG4V2_DECODER 1
 %define CONFIG_MSMPEG4V3_DECODER 1
 %define CONFIG_MSMPEG4_CRYSTALHD_DECODER 0
+%define CONFIG_MSP2_DECODER 1
 %define CONFIG_MSRLE_DECODER 1
 %define CONFIG_MSS1_DECODER 1
 %define CONFIG_MSS2_DECODER 1
@@ -1272,6 +1275,7 @@
 %define CONFIG_LIBOPUS_DECODER 1
 %define CONFIG_LIBRSVG_DECODER 0
 %define CONFIG_LIBSPEEX_DECODER 1
+%define CONFIG_LIBUAVS3D_DECODER 0
 %define CONFIG_LIBVORBIS_DECODER 1
 %define CONFIG_LIBVPX_VP8_DECODER 1
 %define CONFIG_LIBVPX_VP9_DECODER 1
@@ -1281,6 +1285,8 @@
 %define CONFIG_IDF_DECODER 1
 %define CONFIG_LIBAOM_AV1_DECODER 0
 %define CONFIG_AV1_DECODER 1
+%define CONFIG_AV1_CUVID_DECODER 1
+%define CONFIG_AV1_QSV_DECODER 1
 %define CONFIG_LIBOPENH264_DECODER 0
 %define CONFIG_H264_CUVID_DECODER 1
 %define CONFIG_HEVC_CUVID_DECODER 1
@@ -1298,7 +1304,6 @@
 %define CONFIG_VP9_CUVID_DECODER 1
 %define CONFIG_VP9_MEDIACODEC_DECODER 0
 %define CONFIG_VP9_QSV_DECODER 1
-%define CONFIG_AV1_QSV_DECODER 1
 %define CONFIG_A64MULTI_ENCODER 1
 %define CONFIG_A64MULTI5_ENCODER 1
 %define CONFIG_ALIAS_PIX_ENCODER 1
@@ -1361,6 +1366,7 @@
 %define CONFIG_S302M_ENCODER 1
 %define CONFIG_SGI_ENCODER 1
 %define CONFIG_SNOW_ENCODER 1
+%define CONFIG_SPEEDHQ_ENCODER 1
 %define CONFIG_SUNRAST_ENCODER 1
 %define CONFIG_SVQ1_ENCODER 1
 %define CONFIG_TARGA_ENCODER 1
@@ -1442,6 +1448,8 @@
 %define CONFIG_ADPCM_G722_ENCODER 1
 %define CONFIG_ADPCM_G726_ENCODER 1
 %define CONFIG_ADPCM_G726LE_ENCODER 1
+%define CONFIG_ADPCM_IMA_AMV_ENCODER 1
+%define CONFIG_ADPCM_IMA_ALP_ENCODER 1
 %define CONFIG_ADPCM_IMA_APM_ENCODER 1
 %define CONFIG_ADPCM_IMA_QT_ENCODER 1
 %define CONFIG_ADPCM_IMA_SSI_ENCODER 1
@@ -1527,6 +1535,11 @@
 %define CONFIG_VP8_VAAPI_ENCODER 0
 %define CONFIG_VP9_VAAPI_ENCODER 0
 %define CONFIG_VP9_QSV_ENCODER 1
+%define CONFIG_AV1_D3D11VA_HWACCEL 0
+%define CONFIG_AV1_D3D11VA2_HWACCEL 0
+%define CONFIG_AV1_DXVA2_HWACCEL 0
+%define CONFIG_AV1_NVDEC_HWACCEL 1
+%define CONFIG_AV1_VAAPI_HWACCEL 0
 %define CONFIG_H263_VAAPI_HWACCEL 0
 %define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0
 %define CONFIG_H264_D3D11VA_HWACCEL 1
@@ -1587,6 +1600,7 @@
 %define CONFIG_ADX_PARSER 1
 %define CONFIG_AV1_PARSER 1
 %define CONFIG_AVS2_PARSER 1
+%define CONFIG_AVS3_PARSER 1
 %define CONFIG_BMP_PARSER 1
 %define CONFIG_CAVSVIDEO_PARSER 1
 %define CONFIG_COOK_PARSER 1
@@ -1673,6 +1687,7 @@
 %define CONFIG_ADECLICK_FILTER 1
 %define CONFIG_ADECLIP_FILTER 1
 %define CONFIG_ADELAY_FILTER 1
+%define CONFIG_ADENORM_FILTER 1
 %define CONFIG_ADERIVATIVE_FILTER 1
 %define CONFIG_AECHO_FILTER 1
 %define CONFIG_AEMPHASIS_FILTER 1
@@ -1682,6 +1697,7 @@
 %define CONFIG_AFFTFILT_FILTER 1
 %define CONFIG_AFIR_FILTER 1
 %define CONFIG_AFORMAT_FILTER 1
+%define CONFIG_AFREQSHIFT_FILTER 1
 %define CONFIG_AGATE_FILTER 1
 %define CONFIG_AIIR_FILTER 1
 %define CONFIG_AINTEGRAL_FILTER 1
@@ -1700,6 +1716,7 @@
 %define CONFIG_APAD_FILTER 1
 %define CONFIG_APERMS_FILTER 1
 %define CONFIG_APHASER_FILTER 1
+%define CONFIG_APHASESHIFT_FILTER 1
 %define CONFIG_APULSATOR_FILTER 1
 %define CONFIG_AREALTIME_FILTER 1
 %define CONFIG_ARESAMPLE_FILTER 1
@@ -1719,6 +1736,10 @@
 %define CONFIG_ASTATS_FILTER 1
 %define CONFIG_ASTREAMSELECT_FILTER 1
 %define CONFIG_ASUBBOOST_FILTER 1
+%define CONFIG_ASUBCUT_FILTER 1
+%define CONFIG_ASUPERCUT_FILTER 1
+%define CONFIG_ASUPERPASS_FILTER 1
+%define CONFIG_ASUPERSTOP_FILTER 1
 %define CONFIG_ATEMPO_FILTER 1
 %define CONFIG_ATRIM_FILTER 1
 %define CONFIG_AXCORRELATE_FILTER 1
@@ -1767,6 +1788,7 @@
 %define CONFIG_SILENCEDETECT_FILTER 1
 %define CONFIG_SILENCEREMOVE_FILTER 1
 %define CONFIG_SOFALIZER_FILTER 0
+%define CONFIG_SPEECHNORM_FILTER 1
 %define CONFIG_STEREOTOOLS_FILTER 1
 %define CONFIG_STEREOWIDEN_FILTER 1
 %define CONFIG_SUPEREQUALIZER_FILTER 1
@@ -2128,6 +2150,7 @@
 %define CONFIG_AAC_DEMUXER 1
 %define CONFIG_AAX_DEMUXER 1
 %define CONFIG_AC3_DEMUXER 1
+%define CONFIG_ACE_DEMUXER 1
 %define CONFIG_ACM_DEMUXER 1
 %define CONFIG_ACT_DEMUXER 1
 %define CONFIG_ADF_DEMUXER 1
@@ -2163,6 +2186,7 @@
 %define CONFIG_AVR_DEMUXER 1
 %define CONFIG_AVS_DEMUXER 1
 %define CONFIG_AVS2_DEMUXER 1
+%define CONFIG_AVS3_DEMUXER 1
 %define CONFIG_BETHSOFTVID_DEMUXER 1
 %define CONFIG_BFI_DEMUXER 1
 %define CONFIG_BINTEXT_DEMUXER 1
@@ -2287,6 +2311,7 @@
 %define CONFIG_MPSUB_DEMUXER 1
 %define CONFIG_MSF_DEMUXER 1
 %define CONFIG_MSNWC_TCP_DEMUXER 1
+%define CONFIG_MSP_DEMUXER 1
 %define CONFIG_MTAF_DEMUXER 1
 %define CONFIG_MTV_DEMUXER 1
 %define CONFIG_MUSX_DEMUXER 1
@@ -2416,6 +2441,7 @@
 %define CONFIG_YOP_DEMUXER 1
 %define CONFIG_YUV4MPEGPIPE_DEMUXER 1
 %define CONFIG_IMAGE_BMP_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_CRI_PIPE_DEMUXER 1
 %define CONFIG_IMAGE_DDS_PIPE_DEMUXER 1
 %define CONFIG_IMAGE_DPX_PIPE_DEMUXER 1
 %define CONFIG_IMAGE_EXR_PIPE_DEMUXER 1
@@ -2451,7 +2477,9 @@
 %define CONFIG_ADTS_MUXER 1
 %define CONFIG_ADX_MUXER 1
 %define CONFIG_AIFF_MUXER 1
+%define CONFIG_ALP_MUXER 1
 %define CONFIG_AMR_MUXER 1
+%define CONFIG_AMV_MUXER 1
 %define CONFIG_APM_MUXER 1
 %define CONFIG_APNG_MUXER 1
 %define CONFIG_APTX_MUXER 1

SMP/config.h

@@ -570,6 +570,7 @@
 #define CONFIG_LIBTESSERACT 0
 #define CONFIG_LIBTHEORA 1
 #define CONFIG_LIBTWOLAME 0
+#define CONFIG_LIBUAVS3D 0
 #define CONFIG_LIBV4L2 0
 #define CONFIG_LIBVMAF 0
 #define CONFIG_LIBVORBIS 1
@@ -863,6 +864,7 @@
 #define CONFIG_CLLC_DECODER 1
 #define CONFIG_COMFORTNOISE_DECODER 1
 #define CONFIG_CPIA_DECODER 1
+#define CONFIG_CRI_DECODER 1
 #define CONFIG_CSCD_DECODER 1
 #define CONFIG_CYUV_DECODER 1
 #define CONFIG_DDS_DECODER 1
@@ -970,6 +972,7 @@
 #define CONFIG_MSMPEG4V2_DECODER 1
 #define CONFIG_MSMPEG4V3_DECODER 1
 #define CONFIG_MSMPEG4_CRYSTALHD_DECODER 0
+#define CONFIG_MSP2_DECODER 1
 #define CONFIG_MSRLE_DECODER 1
 #define CONFIG_MSS1_DECODER 1
 #define CONFIG_MSS2_DECODER 1
@@ -1342,6 +1345,7 @@
 #define CONFIG_LIBOPUS_DECODER 1
 #define CONFIG_LIBRSVG_DECODER 0
 #define CONFIG_LIBSPEEX_DECODER 1
+#define CONFIG_LIBUAVS3D_DECODER 0
 #define CONFIG_LIBVORBIS_DECODER 1
 #define CONFIG_LIBVPX_VP8_DECODER 1
 #define CONFIG_LIBVPX_VP9_DECODER 1
@@ -1351,6 +1355,8 @@
 #define CONFIG_IDF_DECODER 1
 #define CONFIG_LIBAOM_AV1_DECODER 0
 #define CONFIG_AV1_DECODER 1
+#define CONFIG_AV1_CUVID_DECODER 1
+#define CONFIG_AV1_QSV_DECODER 1
 #define CONFIG_LIBOPENH264_DECODER 0
 #define CONFIG_H264_CUVID_DECODER 1
 #define CONFIG_HEVC_CUVID_DECODER 1
@@ -1368,7 +1374,6 @@
 #define CONFIG_VP9_CUVID_DECODER 1
 #define CONFIG_VP9_MEDIACODEC_DECODER 0
 #define CONFIG_VP9_QSV_DECODER 1
-#define CONFIG_AV1_QSV_DECODER 1
 #define CONFIG_A64MULTI_ENCODER 1
 #define CONFIG_A64MULTI5_ENCODER 1
 #define CONFIG_ALIAS_PIX_ENCODER 1
@@ -1431,6 +1436,7 @@
 #define CONFIG_S302M_ENCODER 1
 #define CONFIG_SGI_ENCODER 1
 #define CONFIG_SNOW_ENCODER 1
+#define CONFIG_SPEEDHQ_ENCODER 1
 #define CONFIG_SUNRAST_ENCODER 1
 #define CONFIG_SVQ1_ENCODER 1
 #define CONFIG_TARGA_ENCODER 1
@@ -1512,6 +1518,8 @@
 #define CONFIG_ADPCM_G722_ENCODER 1
 #define CONFIG_ADPCM_G726_ENCODER 1
 #define CONFIG_ADPCM_G726LE_ENCODER 1
+#define CONFIG_ADPCM_IMA_AMV_ENCODER 1
+#define CONFIG_ADPCM_IMA_ALP_ENCODER 1
 #define CONFIG_ADPCM_IMA_APM_ENCODER 1
 #define CONFIG_ADPCM_IMA_QT_ENCODER 1
 #define CONFIG_ADPCM_IMA_SSI_ENCODER 1
@@ -1597,6 +1605,11 @@
 #define CONFIG_VP8_VAAPI_ENCODER 0
 #define CONFIG_VP9_VAAPI_ENCODER 0
 #define CONFIG_VP9_QSV_ENCODER 1
+#define CONFIG_AV1_D3D11VA_HWACCEL 0
+#define CONFIG_AV1_D3D11VA2_HWACCEL 0
+#define CONFIG_AV1_DXVA2_HWACCEL 0
+#define CONFIG_AV1_NVDEC_HWACCEL 1
+#define CONFIG_AV1_VAAPI_HWACCEL 0
 #define CONFIG_H263_VAAPI_HWACCEL 0
 #define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0
 #if CONFIG_D3D11VA
@@ -1709,6 +1722,7 @@
 #define CONFIG_ADX_PARSER 1
 #define CONFIG_AV1_PARSER 1
 #define CONFIG_AVS2_PARSER 1
+#define CONFIG_AVS3_PARSER 1
 #define CONFIG_BMP_PARSER 1
 #define CONFIG_CAVSVIDEO_PARSER 1
 #define CONFIG_COOK_PARSER 1
@@ -1795,6 +1809,7 @@
 #define CONFIG_ADECLICK_FILTER 1
 #define CONFIG_ADECLIP_FILTER 1
 #define CONFIG_ADELAY_FILTER 1
+#define CONFIG_ADENORM_FILTER 1
 #define CONFIG_ADERIVATIVE_FILTER 1
 #define CONFIG_AECHO_FILTER 1
 #define CONFIG_AEMPHASIS_FILTER 1
@@ -1804,6 +1819,7 @@
 #define CONFIG_AFFTFILT_FILTER 1
 #define CONFIG_AFIR_FILTER 1
 #define CONFIG_AFORMAT_FILTER 1
+#define CONFIG_AFREQSHIFT_FILTER 1
 #define CONFIG_AGATE_FILTER 1
 #define CONFIG_AIIR_FILTER 1
 #define CONFIG_AINTEGRAL_FILTER 1
@@ -1822,6 +1838,7 @@
 #define CONFIG_APAD_FILTER 1
 #define CONFIG_APERMS_FILTER 1
 #define CONFIG_APHASER_FILTER 1
+#define CONFIG_APHASESHIFT_FILTER 1
 #define CONFIG_APULSATOR_FILTER 1
 #define CONFIG_AREALTIME_FILTER 1
 #define CONFIG_ARESAMPLE_FILTER 1
@@ -1841,6 +1858,10 @@
 #define CONFIG_ASTATS_FILTER 1
 #define CONFIG_ASTREAMSELECT_FILTER 1
 #define CONFIG_ASUBBOOST_FILTER 1
+#define CONFIG_ASUBCUT_FILTER 1
+#define CONFIG_ASUPERCUT_FILTER 1
+#define CONFIG_ASUPERPASS_FILTER 1
+#define CONFIG_ASUPERSTOP_FILTER 1
 #define CONFIG_ATEMPO_FILTER 1
 #define CONFIG_ATRIM_FILTER 1
 #define CONFIG_AXCORRELATE_FILTER 1
@@ -1889,6 +1910,7 @@
 #define CONFIG_SILENCEDETECT_FILTER 1
 #define CONFIG_SILENCEREMOVE_FILTER 1
 #define CONFIG_SOFALIZER_FILTER 0
+#define CONFIG_SPEECHNORM_FILTER 1
 #define CONFIG_STEREOTOOLS_FILTER 1
 #define CONFIG_STEREOWIDEN_FILTER 1
 #define CONFIG_SUPEREQUALIZER_FILTER 1
@@ -2250,6 +2272,7 @@
 #define CONFIG_AAC_DEMUXER 1
 #define CONFIG_AAX_DEMUXER 1
 #define CONFIG_AC3_DEMUXER 1
+#define CONFIG_ACE_DEMUXER 1
 #define CONFIG_ACM_DEMUXER 1
 #define CONFIG_ACT_DEMUXER 1
 #define CONFIG_ADF_DEMUXER 1
@@ -2285,6 +2308,7 @@
 #define CONFIG_AVR_DEMUXER 1
 #define CONFIG_AVS_DEMUXER 1
 #define CONFIG_AVS2_DEMUXER 1
+#define CONFIG_AVS3_DEMUXER 1
 #define CONFIG_BETHSOFTVID_DEMUXER 1
 #define CONFIG_BFI_DEMUXER 1
 #define CONFIG_BINTEXT_DEMUXER 1
@@ -2409,6 +2433,7 @@
 #define CONFIG_MPSUB_DEMUXER 1
 #define CONFIG_MSF_DEMUXER 1
 #define CONFIG_MSNWC_TCP_DEMUXER 1
+#define CONFIG_MSP_DEMUXER 1
 #define CONFIG_MTAF_DEMUXER 1
 #define CONFIG_MTV_DEMUXER 1
 #define CONFIG_MUSX_DEMUXER 1
@@ -2538,6 +2563,7 @@
 #define CONFIG_YOP_DEMUXER 1
 #define CONFIG_YUV4MPEGPIPE_DEMUXER 1
 #define CONFIG_IMAGE_BMP_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_CRI_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_DDS_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_DPX_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_EXR_PIPE_DEMUXER 1
@@ -2573,7 +2599,9 @@
 #define CONFIG_ADTS_MUXER 1
 #define CONFIG_ADX_MUXER 1
 #define CONFIG_AIFF_MUXER 1
+#define CONFIG_ALP_MUXER 1
 #define CONFIG_AMR_MUXER 1
+#define CONFIG_AMV_MUXER 1
 #define CONFIG_APM_MUXER 1
 #define CONFIG_APNG_MUXER 1
 #define CONFIG_APTX_MUXER 1

SMP/libavcodec.def

@@ -195,7 +195,6 @@ EXPORTS
     avpicture_layout
     avpriv_ac3_parse_header
     avpriv_align_put_bits
-    avpriv_bprint_to_extradata
     avpriv_codec2_mode_bit_rate
     avpriv_codec2_mode_block_align
     avpriv_codec2_mode_frame_size
@@ -221,7 +220,6 @@ EXPORTS
     avpriv_packet_list_free
     avpriv_packet_list_get
     avpriv_packet_list_put
-    avpriv_put_string
     avpriv_split_xiph_headers
     avpriv_tak_parse_streaminfo
     avpriv_toupper4

SMP/libavcodec.vcxproj

@@ -231,6 +231,7 @@
     <ClCompile Include="..\libavcodec\hevc_ps.c" />
     <ClCompile Include="..\libavcodec\hevc_sei.c" />
     <ClCompile Include="..\libavcodec\hevc_data.c" />
+    <ClCompile Include="..\libavcodec\dynamic_hdr10_plus.c" />
     <ClCompile Include="..\libavcodec\huffman.c" />
     <ClCompile Include="..\libavcodec\jrevdct.c" />
     <ClCompile Include="..\libavcodec\iirfilter.c" />
@@ -247,6 +248,7 @@
     <ClCompile Include="..\libavcodec\mdct_fixed_32.c" />
     <ClCompile Include="..\libavcodec\mpeg_er.c" />
     <ClCompile Include="..\libavcodec\mpegaudio.c" />
+    <ClCompile Include="..\libavcodec\mpegaudiodec_common.c" />
     <ClCompile Include="..\libavcodec\mpegaudiodsp.c" />
     <ClCompile Include="..\libavcodec\mpegaudiodsp_data.c" />
     <ClCompile Include="..\libavcodec\mpegaudiodsp_fixed.c" />
@@ -366,6 +368,7 @@
     <ClCompile Include="..\libavcodec\cyuv.c" />
     <ClCompile Include="..\libavcodec\aura.c" />
     <ClCompile Include="..\libavcodec\av1dec.c" />
+    <ClCompile Include="..\libavcodec\cuviddec.c" />
     <ClCompile Include="..\libavcodec\avrndec.c" />
     <ClCompile Include="..\libavcodec\mjpegdec.c" />
     <ClCompile Include="..\libavcodec\r210dec.c" />
@@ -410,6 +413,7 @@
     <ClCompile Include="..\libavcodec\cngenc.c" />
     <ClCompile Include="..\libavcodec\cook.c" />
     <ClCompile Include="..\libavcodec\cpia.c" />
+    <ClCompile Include="..\libavcodec\cri.c" />
     <ClCompile Include="..\libavcodec\cscd.c" />
     <ClCompile Include="..\libavcodec\dcadec.c" />
     <ClCompile Include="..\libavcodec\dca.c" />
@@ -530,7 +534,6 @@
     <ClCompile Include="..\libavcodec\h264_slice.c" />
     <ClCompile Include="..\libavcodec\h264data.c" />
     <ClCompile Include="..\libavcodec\amfenc_h264.c" />
-    <ClCompile Include="..\libavcodec\cuviddec.c" />
     <ClCompile Include="..\libavcodec\nvenc_h264.c" />
     <ClCompile Include="..\libavcodec\qsvdec_h2645.c" />
     <ClCompile Include="..\libavcodec\qsvenc_h264.c" />
@@ -628,6 +631,7 @@
     <ClCompile Include="..\libavcodec\msmpeg4dec.c" />
     <ClCompile Include="..\libavcodec\msmpeg4.c" />
     <ClCompile Include="..\libavcodec\msmpeg4enc.c" />
+    <ClCompile Include="..\libavcodec\msp2dec.c" />
     <ClCompile Include="..\libavcodec\msrle.c" />
     <ClCompile Include="..\libavcodec\mss1.c" />
     <ClCompile Include="..\libavcodec\mss12.c" />
@@ -731,13 +735,13 @@
     <ClCompile Include="..\libavcodec\siren.c" />
     <ClCompile Include="..\libavcodec\smacker.c" />
     <ClCompile Include="..\libavcodec\smc.c" />
-    <ClCompile Include="..\libavcodec\smvjpegdec.c" />
     <ClCompile Include="..\libavcodec\snowdec.c" />
     <ClCompile Include="..\libavcodec\snow.c" />
     <ClCompile Include="..\libavcodec\snow_dwt.c" />
     <ClCompile Include="..\libavcodec\snowenc.c" />
     <ClCompile Include="..\libavcodec\sonic.c" />
     <ClCompile Include="..\libavcodec\speedhq.c" />
+    <ClCompile Include="..\libavcodec\speedhqenc.c" />
     <ClCompile Include="..\libavcodec\sp5xdec.c" />
     <ClCompile Include="..\libavcodec\srtdec.c" />
     <ClCompile Include="..\libavcodec\srtenc.c" />
@@ -880,6 +884,7 @@
     <ClCompile Include="..\libavcodec\vima.c" />
     <ClCompile Include="..\libavcodec\dxva2.c" />
     <ClCompile Include="..\libavcodec\nvdec.c" />
+    <ClCompile Include="..\libavcodec\nvdec_av1.c" />
     <ClCompile Include="..\libavcodec\dxva2_h264.c" />
     <ClCompile Include="..\libavcodec\nvdec_h264.c" />
     <ClCompile Include="..\libavcodec\dxva2_hevc.c" />
@@ -916,6 +921,7 @@
     <ClCompile Include="..\libavcodec\av1_parser.c" />
     <ClCompile Include="..\libavcodec\av1_parse.c" />
     <ClCompile Include="..\libavcodec\avs2_parser.c" />
+    <ClCompile Include="..\libavcodec\avs3_parser.c" />
     <ClCompile Include="..\libavcodec\bmp_parser.c" />
     <ClCompile Include="..\libavcodec\cavs_parser.c" />
     <ClCompile Include="..\libavcodec\cook_parser.c" />

SMP/libavcodec.vcxproj.filters

@@ -543,6 +543,9 @@
     <ClCompile Include="..\libavcodec\hevc_data.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\dynamic_hdr10_plus.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\huffman.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -591,6 +594,9 @@
     <ClCompile Include="..\libavcodec\mpegaudio.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\mpegaudiodec_common.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\mpegaudiodsp.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -948,6 +954,9 @@
     <ClCompile Include="..\libavcodec\av1dec.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\cuviddec.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\avrndec.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -1080,6 +1089,9 @@
     <ClCompile Include="..\libavcodec\cpia.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\cri.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\cscd.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -1440,9 +1452,6 @@
     <ClCompile Include="..\libavcodec\amfenc_h264.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\cuviddec.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavcodec\nvenc_h264.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -1734,6 +1743,9 @@
     <ClCompile Include="..\libavcodec\msmpeg4enc.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\msp2dec.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\msrle.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -2043,9 +2055,6 @@
     <ClCompile Include="..\libavcodec\smc.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\smvjpegdec.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavcodec\snowdec.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -2064,6 +2073,9 @@
     <ClCompile Include="..\libavcodec\speedhq.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\speedhqenc.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\sp5xdec.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -2490,6 +2502,9 @@
     <ClCompile Include="..\libavcodec\nvdec.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\nvdec_av1.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\dxva2_h264.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -2598,6 +2613,9 @@
     <ClCompile Include="..\libavcodec\avs2_parser.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\avs3_parser.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\bmp_parser.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>

SMP/libavcodec/codec_list.c

@@ -80,6 +80,7 @@ static const AVCodec *codec_list[] = {
     &ff_s302m_encoder,
     &ff_sgi_encoder,
     &ff_snow_encoder,
+    &ff_speedhq_encoder,
     &ff_sunrast_encoder,
     &ff_svq1_encoder,
     &ff_targa_encoder,
@@ -161,6 +162,8 @@ static const AVCodec *codec_list[] = {
     &ff_adpcm_g722_encoder,
     &ff_adpcm_g726_encoder,
     &ff_adpcm_g726le_encoder,
+    &ff_adpcm_ima_amv_encoder,
+    &ff_adpcm_ima_alp_encoder,
     &ff_adpcm_ima_apm_encoder,
     &ff_adpcm_ima_qt_encoder,
     &ff_adpcm_ima_ssi_encoder,
@@ -245,6 +248,7 @@ static const AVCodec *codec_list[] = {
     &ff_cllc_decoder,
     &ff_comfortnoise_decoder,
     &ff_cpia_decoder,
+    &ff_cri_decoder,
     &ff_cscd_decoder,
     &ff_cyuv_decoder,
     &ff_dds_decoder,
@@ -335,6 +339,7 @@ static const AVCodec *codec_list[] = {
     &ff_msmpeg4v1_decoder,
     &ff_msmpeg4v2_decoder,
     &ff_msmpeg4v3_decoder,
+    &ff_msp2_decoder,
     &ff_msrle_decoder,
     &ff_mss1_decoder,
     &ff_mss2_decoder,
@@ -679,6 +684,8 @@ static const AVCodec *codec_list[] = {
     &ff_xbin_decoder,
     &ff_idf_decoder,
     &ff_av1_decoder,
+    &ff_av1_cuvid_decoder,
+    &ff_av1_qsv_decoder,
     &ff_h264_cuvid_decoder,
     &ff_hevc_cuvid_decoder,
     &ff_mjpeg_cuvid_decoder,
@@ -691,5 +698,4 @@ static const AVCodec *codec_list[] = {
     &ff_vp8_qsv_decoder,
     &ff_vp9_cuvid_decoder,
     &ff_vp9_qsv_decoder,
-    &ff_av1_qsv_decoder,
     NULL };
\ No newline at end of file

SMP/libavcodec/parser_list.c

@@ -25,6 +25,7 @@ static const AVCodecParser *parser_list[] = {
     &ff_adx_parser,
     &ff_av1_parser,
     &ff_avs2_parser,
+    &ff_avs3_parser,
     &ff_bmp_parser,
     &ff_cavsvideo_parser,
     &ff_cook_parser,

SMP/libavfilter.vcxproj

@@ -125,6 +125,7 @@
     <ClCompile Include="..\libavfilter\f_cue.c" />
     <ClCompile Include="..\libavfilter\af_adeclick.c" />
     <ClCompile Include="..\libavfilter\af_adelay.c" />
+    <ClCompile Include="..\libavfilter\af_adenorm.c" />
     <ClCompile Include="..\libavfilter\af_aderivative.c" />
     <ClCompile Include="..\libavfilter\af_aecho.c" />
     <ClCompile Include="..\libavfilter\af_aemphasis.c" />
@@ -132,6 +133,7 @@
     <ClCompile Include="..\libavfilter\af_afftdn.c" />
     <ClCompile Include="..\libavfilter\af_afftfilt.c" />
     <ClCompile Include="..\libavfilter\af_aformat.c" />
+    <ClCompile Include="..\libavfilter\af_afreqshift.c" />
     <ClCompile Include="..\libavfilter\af_agate.c" />
     <ClCompile Include="..\libavfilter\af_aiir.c" />
     <ClCompile Include="..\libavfilter\f_interleave.c" />
@@ -168,6 +170,7 @@
     <ClCompile Include="..\libavfilter\f_streamselect.c" />
     <ClCompile Include="..\libavfilter\framesync.c" />
     <ClCompile Include="..\libavfilter\af_asubboost.c" />
+    <ClCompile Include="..\libavfilter\af_asupercut.c" />
     <ClCompile Include="..\libavfilter\af_atempo.c" />
     <ClCompile Include="..\libavfilter\trim.c" />
     <ClCompile Include="..\libavfilter\af_axcorrelate.c" />
@@ -198,6 +201,7 @@
     <ClCompile Include="..\libavfilter\af_replaygain.c" />
     <ClCompile Include="..\libavfilter\af_silencedetect.c" />
     <ClCompile Include="..\libavfilter\af_silenceremove.c" />
+    <ClCompile Include="..\libavfilter\af_speechnorm.c" />
     <ClCompile Include="..\libavfilter\af_stereotools.c" />
     <ClCompile Include="..\libavfilter\af_stereowiden.c" />
     <ClCompile Include="..\libavfilter\af_superequalizer.c" />

SMP/libavfilter.vcxproj.filters

@@ -228,6 +228,9 @@
     <ClCompile Include="..\libavfilter\af_adelay.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\af_adenorm.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\af_aderivative.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -249,6 +252,9 @@
     <ClCompile Include="..\libavfilter\af_aformat.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\af_afreqshift.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\af_agate.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -357,6 +363,9 @@
     <ClCompile Include="..\libavfilter\af_asubboost.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\af_asupercut.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\af_atempo.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -447,6 +456,9 @@
     <ClCompile Include="..\libavfilter\af_silenceremove.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\af_speechnorm.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\af_stereotools.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>

SMP/libavfilter/filter_list.c

@@ -30,6 +30,7 @@ static const AVFilter *filter_list[] = {
     &ff_af_adeclick,
     &ff_af_adeclip,
     &ff_af_adelay,
+    &ff_af_adenorm,
     &ff_af_aderivative,
     &ff_af_aecho,
     &ff_af_aemphasis,
@@ -39,6 +40,7 @@ static const AVFilter *filter_list[] = {
     &ff_af_afftfilt,
     &ff_af_afir,
     &ff_af_aformat,
+    &ff_af_afreqshift,
     &ff_af_agate,
     &ff_af_aiir,
     &ff_af_aintegral,
@@ -57,6 +59,7 @@ static const AVFilter *filter_list[] = {
     &ff_af_apad,
     &ff_af_aperms,
     &ff_af_aphaser,
+    &ff_af_aphaseshift,
     &ff_af_apulsator,
     &ff_af_arealtime,
     &ff_af_aresample,
@@ -75,6 +78,10 @@ static const AVFilter *filter_list[] = {
     &ff_af_astats,
     &ff_af_astreamselect,
     &ff_af_asubboost,
+    &ff_af_asubcut,
+    &ff_af_asupercut,
+    &ff_af_asuperpass,
+    &ff_af_asuperstop,
     &ff_af_atempo,
     &ff_af_atrim,
     &ff_af_axcorrelate,
@@ -115,6 +122,7 @@ static const AVFilter *filter_list[] = {
     &ff_af_sidechaingate,
     &ff_af_silencedetect,
     &ff_af_silenceremove,
+    &ff_af_speechnorm,
     &ff_af_stereotools,
     &ff_af_stereowiden,
     &ff_af_superequalizer,

SMP/libavformat.vcxproj

@@ -123,6 +123,7 @@
     <ClCompile Include="..\libavformat\rawdec.c" />
     <ClCompile Include="..\libavformat\aaxdec.c" />
     <ClCompile Include="..\libavformat\ac3dec.c" />
+    <ClCompile Include="..\libavformat\acedec.c" />
     <ClCompile Include="..\libavformat\acm.c" />
     <ClCompile Include="..\libavformat\act.c" />
     <ClCompile Include="..\libavformat\bintext.c" />
@@ -142,6 +143,7 @@
     <ClCompile Include="..\libavformat\aixdec.c" />
     <ClCompile Include="..\libavformat\alp.c" />
     <ClCompile Include="..\libavformat\amr.c" />
+    <ClCompile Include="..\libavformat\amvenc.c" />
     <ClCompile Include="..\libavformat\anm.c" />
     <ClCompile Include="..\libavformat\apc.c" />
     <ClCompile Include="..\libavformat\ape.c" />
@@ -176,7 +178,8 @@
     <ClCompile Include="..\libavformat\voc_packet.c" />
     <ClCompile Include="..\libavformat\vocdec.c" />
     <ClCompile Include="..\libavformat\voc.c" />
-    <ClCompile Include="..\libavformat\davs2.c" />
+    <ClCompile Include="..\libavformat\avs2dec.c" />
+    <ClCompile Include="..\libavformat\avs3dec.c" />
     <ClCompile Include="..\libavformat\bethsoftvid.c" />
     <ClCompile Include="..\libavformat\bfi.c" />
     <ClCompile Include="..\libavformat\bink.c" />
@@ -341,6 +344,7 @@
     <ClCompile Include="..\libavformat\msf.c" />
     <ClCompile Include="..\libavformat\mpsubdec.c" />
     <ClCompile Include="..\libavformat\msnwc_tcp.c" />
+    <ClCompile Include="..\libavformat\mspdec.c" />
     <ClCompile Include="..\libavformat\mtaf.c" />
     <ClCompile Include="..\libavformat\mtv.c" />
     <ClCompile Include="..\libavformat\musx.c" />

SMP/libavformat.vcxproj.filters

@@ -220,6 +220,9 @@
     <ClCompile Include="..\libavformat\ac3dec.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\acedec.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\acm.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
@@ -277,6 +280,9 @@
     <ClCompile Include="..\libavformat\amr.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\amvenc.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\anm.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
@@ -379,7 +385,10 @@
     <ClCompile Include="..\libavformat\voc.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavformat\davs2.c">
+    <ClCompile Include="..\libavformat\avs2dec.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavformat\avs3dec.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
     <ClCompile Include="..\libavformat\bethsoftvid.c">
@@ -874,6 +883,9 @@
     <ClCompile Include="..\libavformat\msnwc_tcp.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\mspdec.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\mtaf.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>

SMP/libavformat/demuxer_list.c

@@ -23,6 +23,7 @@ static const AVInputFormat *demuxer_list[] = {
     &ff_aac_demuxer,
     &ff_aax_demuxer,
     &ff_ac3_demuxer,
+    &ff_ace_demuxer,
     &ff_acm_demuxer,
     &ff_act_demuxer,
     &ff_adf_demuxer,
@@ -57,6 +58,7 @@ static const AVInputFormat *demuxer_list[] = {
     &ff_avr_demuxer,
     &ff_avs_demuxer,
     &ff_avs2_demuxer,
+    &ff_avs3_demuxer,
     &ff_bethsoftvid_demuxer,
     &ff_bfi_demuxer,
     &ff_bintext_demuxer,
@@ -181,6 +183,7 @@ static const AVInputFormat *demuxer_list[] = {
     &ff_mpsub_demuxer,
     &ff_msf_demuxer,
     &ff_msnwc_tcp_demuxer,
+    &ff_msp_demuxer,
     &ff_mtaf_demuxer,
     &ff_mtv_demuxer,
     &ff_musx_demuxer,
@@ -310,6 +313,7 @@ static const AVInputFormat *demuxer_list[] = {
     &ff_yop_demuxer,
     &ff_yuv4mpegpipe_demuxer,
     &ff_image_bmp_pipe_demuxer,
+    &ff_image_cri_pipe_demuxer,
     &ff_image_dds_pipe_demuxer,
     &ff_image_dpx_pipe_demuxer,
     &ff_image_exr_pipe_demuxer,

SMP/libavformat/muxer_list.c

@@ -24,7 +24,9 @@ static const AVOutputFormat *muxer_list[] = {
     &ff_adts_muxer,
     &ff_adx_muxer,
     &ff_aiff_muxer,
+    &ff_alp_muxer,
     &ff_amr_muxer,
+    &ff_amv_muxer,
     &ff_apm_muxer,
     &ff_apng_muxer,
     &ff_aptx_muxer,

SMP/libavutil.def

@@ -158,6 +158,8 @@ EXPORTS
     av_fifo_space
     av_file_map
     av_file_unmap
+    av_film_grain_params_alloc
+    av_film_grain_params_create_side_data
     av_find_best_pix_fmt_of_2
     av_find_info_tag
     av_find_nearest_q_idx
@@ -486,6 +488,7 @@ EXPORTS
     av_timecode_get_smpte
     av_timecode_get_smpte_from_framenum
     av_timecode_init
+    av_timecode_init_from_components
     av_timecode_init_from_string
     av_timecode_make_mpeg_tc_string
     av_timecode_make_smpte_tc_string

SMP/libavutil.vcxproj

@@ -139,6 +139,7 @@
     <ClCompile Include="..\libavutil\tx_double.c" />
     <ClCompile Include="..\libavutil\tx_int32.c" />
     <ClCompile Include="..\libavutil\video_enc_params.c" />
+    <ClCompile Include="..\libavutil\film_grain_params.c" />
     <ClCompile Include="..\libavutil\hwcontext_cuda.c" />
     <ClCompile Include="..\libavutil\hwcontext_dxva2.c" />
     <ClCompile Include="..\libavutil\lzo.c" />
@@ -256,6 +257,7 @@
     <ClInclude Include="..\libavutil\xtea.h" />
     <ClInclude Include="..\libavutil\tea.h" />
     <ClInclude Include="..\libavutil\tx.h" />
+    <ClInclude Include="..\libavutil\film_grain_params.h" />
     <ClInclude Include="..\libavutil\lzo.h" />
     <ClInclude Include="libavutil\avconfig.h" />
     <ClInclude Include="libavutil\ffversion.h" />
@@ -565,6 +567,7 @@ copy ..\libavutil\video_enc_params.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\xtea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tx.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\film_grain_params.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\lzo.h "$(OutDir)"\include\libavutil
 copy libavutil\avconfig.h "$(OutDir)"\include\libavutil
 copy libavutil\ffversion.h "$(OutDir)"\include\libavutil
@@ -716,6 +719,7 @@ copy ..\libavutil\video_enc_params.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\xtea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tx.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\film_grain_params.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\lzo.h "$(OutDir)"\include\libavutil
 copy libavutil\avconfig.h "$(OutDir)"\include\libavutil
 copy libavutil\ffversion.h "$(OutDir)"\include\libavutil
@@ -874,6 +878,7 @@ copy ..\libavutil\video_enc_params.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\xtea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tx.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\film_grain_params.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\lzo.h "$(OutDir)"\include\libavutil
 copy libavutil\avconfig.h "$(OutDir)"\include\libavutil
 copy libavutil\ffversion.h "$(OutDir)"\include\libavutil
@@ -1030,6 +1035,7 @@ copy ..\libavutil\video_enc_params.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\xtea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tx.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\film_grain_params.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\lzo.h "$(OutDir)"\include\libavutil
 copy libavutil\avconfig.h "$(OutDir)"\include\libavutil
 copy libavutil\ffversion.h "$(OutDir)"\include\libavutil
@@ -1187,6 +1193,7 @@ copy ..\libavutil\video_enc_params.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\xtea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tx.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\film_grain_params.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\lzo.h "$(OutDir)"\include\libavutil
 copy libavutil\avconfig.h "$(OutDir)"\include\libavutil
 copy libavutil\ffversion.h "$(OutDir)"\include\libavutil
@@ -1342,6 +1349,7 @@ copy ..\libavutil\video_enc_params.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\xtea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tx.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\film_grain_params.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\lzo.h "$(OutDir)"\include\libavutil
 copy libavutil\avconfig.h "$(OutDir)"\include\libavutil
 copy libavutil\ffversion.h "$(OutDir)"\include\libavutil
@@ -1505,6 +1513,7 @@ copy ..\libavutil\video_enc_params.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\xtea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tx.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\film_grain_params.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\lzo.h "$(OutDir)"\include\libavutil
 copy libavutil\avconfig.h "$(OutDir)"\include\libavutil
 copy libavutil\ffversion.h "$(OutDir)"\include\libavutil
@@ -1667,6 +1676,7 @@ copy ..\libavutil\video_enc_params.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\xtea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tx.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\film_grain_params.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\lzo.h "$(OutDir)"\include\libavutil
 copy libavutil\avconfig.h "$(OutDir)"\include\libavutil
 copy libavutil\ffversion.h "$(OutDir)"\include\libavutil
@@ -1830,6 +1840,7 @@ copy ..\libavutil\video_enc_params.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\xtea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tx.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\film_grain_params.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\lzo.h "$(OutDir)"\include\libavutil
 copy libavutil\avconfig.h "$(OutDir)"\include\libavutil
 copy libavutil\ffversion.h "$(OutDir)"\include\libavutil
@@ -1992,6 +2003,7 @@ copy ..\libavutil\video_enc_params.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\xtea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tx.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\film_grain_params.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\lzo.h "$(OutDir)"\include\libavutil
 copy libavutil\avconfig.h "$(OutDir)"\include\libavutil
 copy libavutil\ffversion.h "$(OutDir)"\include\libavutil

SMP/libavutil.vcxproj.filters

@@ -273,6 +273,9 @@
     <ClCompile Include="..\libavutil\video_enc_params.c">
       <Filter>Source Files\libavutil</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavutil\film_grain_params.c">
+      <Filter>Source Files\libavutil</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavutil\hwcontext_cuda.c">
       <Filter>Source Files\libavutil</Filter>
     </ClCompile>
@@ -584,6 +587,9 @@
     <ClInclude Include="..\libavutil\tx.h">
       <Filter>Header Files\libavutil</Filter>
     </ClInclude>
+    <ClInclude Include="..\libavutil\film_grain_params.h">
+      <Filter>Header Files\libavutil</Filter>
+    </ClInclude>
     <ClInclude Include="..\libavutil\lzo.h">
       <Filter>Header Files\libavutil</Filter>
     </ClInclude>