projects: Update for upstream merge.

SMP/config.asm

@@ -750,6 +750,7 @@
 %define CONFIG_PCM_RECHUNK_BSF 1
 %define CONFIG_PRORES_METADATA_BSF 1
 %define CONFIG_REMOVE_EXTRADATA_BSF 1
+%define CONFIG_SETTS_BSF 1
 %define CONFIG_TEXT2MOVSUB_BSF 1
 %define CONFIG_TRACE_HEADERS_BSF 1
 %define CONFIG_TRUEHD_CORE_BSF 1
@@ -958,6 +959,7 @@
 %define CONFIG_SGI_DECODER 1
 %define CONFIG_SGIRLE_DECODER 1
 %define CONFIG_SHEERVIDEO_DECODER 1
+%define CONFIG_SIMBIOSIS_IMX_DECODER 1
 %define CONFIG_SMACKER_DECODER 1
 %define CONFIG_SMC_DECODER 1
 %define CONFIG_SMVJPEG_DECODER 1
@@ -1323,6 +1325,7 @@
 %define CONFIG_DNXHD_ENCODER 1
 %define CONFIG_DPX_ENCODER 1
 %define CONFIG_DVVIDEO_ENCODER 1
+%define CONFIG_EXR_ENCODER 1
 %define CONFIG_FFV1_ENCODER 1
 %define CONFIG_FFVHUFF_ENCODER 1
 %define CONFIG_FITS_ENCODER 1
@@ -1349,6 +1352,7 @@
 %define CONFIG_PAM_ENCODER 1
 %define CONFIG_PBM_ENCODER 1
 %define CONFIG_PCX_ENCODER 1
+%define CONFIG_PFM_ENCODER 1
 %define CONFIG_PGM_ENCODER 1
 %define CONFIG_PGMYUV_ENCODER 1
 %define CONFIG_PNG_ENCODER 1
@@ -1605,6 +1609,7 @@
 %define CONFIG_BMP_PARSER 1
 %define CONFIG_CAVSVIDEO_PARSER 1
 %define CONFIG_COOK_PARSER 1
+%define CONFIG_CRI_PARSER 1
 %define CONFIG_DCA_PARSER 1
 %define CONFIG_DIRAC_PARSER 1
 %define CONFIG_DNXHD_PARSER 1
@@ -1644,6 +1649,7 @@
 %define CONFIG_VP8_PARSER 1
 %define CONFIG_VP9_PARSER 1
 %define CONFIG_WEBP_PARSER 1
+%define CONFIG_XBM_PARSER 1
 %define CONFIG_XMA_PARSER 1
 %define CONFIG_ALSA_INDEV 0
 %define CONFIG_ANDROID_CAMERA_INDEV 0
@@ -1694,6 +1700,7 @@
 %define CONFIG_AECHO_FILTER 1
 %define CONFIG_AEMPHASIS_FILTER 1
 %define CONFIG_AEVAL_FILTER 1
+%define CONFIG_AEXCITER_FILTER 1
 %define CONFIG_AFADE_FILTER 1
 %define CONFIG_AFFTDN_FILTER 1
 %define CONFIG_AFFTFILT_FILTER 1
@@ -1838,6 +1845,9 @@
 %define CONFIG_CODECVIEW_FILTER 1
 %define CONFIG_COLORBALANCE_FILTER 1
 %define CONFIG_COLORCHANNELMIXER_FILTER 1
+%define CONFIG_COLORCONTRAST_FILTER 1
+%define CONFIG_COLORCORRECT_FILTER 1
+%define CONFIG_COLORIZE_FILTER 1
 %define CONFIG_COLORKEY_FILTER 1
 %define CONFIG_COLORKEY_OPENCL_FILTER 0
 %define CONFIG_COLORHOLD_FILTER 1
@@ -1892,6 +1902,7 @@
 %define CONFIG_EROSION_FILTER 1
 %define CONFIG_EROSION_OPENCL_FILTER 0
 %define CONFIG_ESTDIF_FILTER 1
+%define CONFIG_EXPOSURE_FILTER 1
 %define CONFIG_EXTRACTPLANES_FILTER 1
 %define CONFIG_FADE_FILTER 1
 %define CONFIG_FFTDNOIZ_FILTER 1
@@ -1964,6 +1975,7 @@
 %define CONFIG_MIDEQUALIZER_FILTER 1
 %define CONFIG_MINTERPOLATE_FILTER 1
 %define CONFIG_MIX_FILTER 1
+%define CONFIG_MONOCHROME_FILTER 1
 %define CONFIG_MPDECIMATE_FILTER 1
 %define CONFIG_NEGATE_FILTER 1
 %define CONFIG_NLMEANS_FILTER 1
@@ -2094,6 +2106,7 @@
 %define CONFIG_VIBRANCE_FILTER 1
 %define CONFIG_VIDSTABDETECT_FILTER 0
 %define CONFIG_VIDSTABTRANSFORM_FILTER 0
+%define CONFIG_VIF_FILTER 1
 %define CONFIG_VIGNETTE_FILTER 1
 %define CONFIG_VMAFMOTION_FILTER 1
 %define CONFIG_VPP_QSV_FILTER 1
@@ -2200,6 +2213,7 @@
 %define CONFIG_BFI_DEMUXER 1
 %define CONFIG_BINTEXT_DEMUXER 1
 %define CONFIG_BINK_DEMUXER 1
+%define CONFIG_BINKA_DEMUXER 1
 %define CONFIG_BIT_DEMUXER 1
 %define CONFIG_BMV_DEMUXER 1
 %define CONFIG_BFSTM_DEMUXER 1
@@ -2391,6 +2405,7 @@
 %define CONFIG_SER_DEMUXER 1
 %define CONFIG_SHORTEN_DEMUXER 1
 %define CONFIG_SIFF_DEMUXER 1
+%define CONFIG_SIMBIOSIS_IMX_DEMUXER 1
 %define CONFIG_SLN_DEMUXER 1
 %define CONFIG_SMACKER_DEMUXER 1
 %define CONFIG_SMJPEG_DEMUXER 1
@@ -2475,6 +2490,7 @@
 %define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 1
 %define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 1
 %define CONFIG_IMAGE_WEBP_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_XBM_PIPE_DEMUXER 1
 %define CONFIG_IMAGE_XPM_PIPE_DEMUXER 1
 %define CONFIG_IMAGE_XWD_PIPE_DEMUXER 1
 %define CONFIG_LIBGME_DEMUXER 1

SMP/config.h

@@ -35,6 +35,7 @@
 #else
 #   define CC_IDENT "msvc"
 #endif
+#define OS_NAME Windows
 #define av_restrict __restrict
 #if defined(__x86_64) || defined(_M_X64)
 #   define EXTERN_PREFIX ""
@@ -820,6 +821,7 @@
 #define CONFIG_PCM_RECHUNK_BSF 1
 #define CONFIG_PRORES_METADATA_BSF 1
 #define CONFIG_REMOVE_EXTRADATA_BSF 1
+#define CONFIG_SETTS_BSF 1
 #define CONFIG_TEXT2MOVSUB_BSF 1
 #define CONFIG_TRACE_HEADERS_BSF 1
 #define CONFIG_TRUEHD_CORE_BSF 1
@@ -1028,6 +1030,7 @@
 #define CONFIG_SGI_DECODER 1
 #define CONFIG_SGIRLE_DECODER 1
 #define CONFIG_SHEERVIDEO_DECODER 1
+#define CONFIG_SIMBIOSIS_IMX_DECODER 1
 #define CONFIG_SMACKER_DECODER 1
 #define CONFIG_SMC_DECODER 1
 #define CONFIG_SMVJPEG_DECODER 1
@@ -1393,6 +1396,7 @@
 #define CONFIG_DNXHD_ENCODER 1
 #define CONFIG_DPX_ENCODER 1
 #define CONFIG_DVVIDEO_ENCODER 1
+#define CONFIG_EXR_ENCODER 1
 #define CONFIG_FFV1_ENCODER 1
 #define CONFIG_FFVHUFF_ENCODER 1
 #define CONFIG_FITS_ENCODER 1
@@ -1419,6 +1423,7 @@
 #define CONFIG_PAM_ENCODER 1
 #define CONFIG_PBM_ENCODER 1
 #define CONFIG_PCX_ENCODER 1
+#define CONFIG_PFM_ENCODER 1
 #define CONFIG_PGM_ENCODER 1
 #define CONFIG_PGMYUV_ENCODER 1
 #define CONFIG_PNG_ENCODER 1
@@ -1727,6 +1732,7 @@
 #define CONFIG_BMP_PARSER 1
 #define CONFIG_CAVSVIDEO_PARSER 1
 #define CONFIG_COOK_PARSER 1
+#define CONFIG_CRI_PARSER 1
 #define CONFIG_DCA_PARSER 1
 #define CONFIG_DIRAC_PARSER 1
 #define CONFIG_DNXHD_PARSER 1
@@ -1766,6 +1772,7 @@
 #define CONFIG_VP8_PARSER 1
 #define CONFIG_VP9_PARSER 1
 #define CONFIG_WEBP_PARSER 1
+#define CONFIG_XBM_PARSER 1
 #define CONFIG_XMA_PARSER 1
 #define CONFIG_ALSA_INDEV 0
 #define CONFIG_ANDROID_CAMERA_INDEV 0
@@ -1816,6 +1823,7 @@
 #define CONFIG_AECHO_FILTER 1
 #define CONFIG_AEMPHASIS_FILTER 1
 #define CONFIG_AEVAL_FILTER 1
+#define CONFIG_AEXCITER_FILTER 1
 #define CONFIG_AFADE_FILTER 1
 #define CONFIG_AFFTDN_FILTER 1
 #define CONFIG_AFFTFILT_FILTER 1
@@ -1960,6 +1968,9 @@
 #define CONFIG_CODECVIEW_FILTER 1
 #define CONFIG_COLORBALANCE_FILTER 1
 #define CONFIG_COLORCHANNELMIXER_FILTER 1
+#define CONFIG_COLORCONTRAST_FILTER 1
+#define CONFIG_COLORCORRECT_FILTER 1
+#define CONFIG_COLORIZE_FILTER 1
 #define CONFIG_COLORKEY_FILTER 1
 #define CONFIG_COLORKEY_OPENCL_FILTER 0
 #define CONFIG_COLORHOLD_FILTER 1
@@ -2014,6 +2025,7 @@
 #define CONFIG_EROSION_FILTER 1
 #define CONFIG_EROSION_OPENCL_FILTER 0
 #define CONFIG_ESTDIF_FILTER 1
+#define CONFIG_EXPOSURE_FILTER 1
 #define CONFIG_EXTRACTPLANES_FILTER 1
 #define CONFIG_FADE_FILTER 1
 #define CONFIG_FFTDNOIZ_FILTER 1
@@ -2086,6 +2098,7 @@
 #define CONFIG_MIDEQUALIZER_FILTER 1
 #define CONFIG_MINTERPOLATE_FILTER 1
 #define CONFIG_MIX_FILTER 1
+#define CONFIG_MONOCHROME_FILTER 1
 #define CONFIG_MPDECIMATE_FILTER 1
 #define CONFIG_NEGATE_FILTER 1
 #define CONFIG_NLMEANS_FILTER 1
@@ -2216,6 +2229,7 @@
 #define CONFIG_VIBRANCE_FILTER 1
 #define CONFIG_VIDSTABDETECT_FILTER 0
 #define CONFIG_VIDSTABTRANSFORM_FILTER 0
+#define CONFIG_VIF_FILTER 1
 #define CONFIG_VIGNETTE_FILTER 1
 #define CONFIG_VMAFMOTION_FILTER 1
 #define CONFIG_VPP_QSV_FILTER 1
@@ -2322,6 +2336,7 @@
 #define CONFIG_BFI_DEMUXER 1
 #define CONFIG_BINTEXT_DEMUXER 1
 #define CONFIG_BINK_DEMUXER 1
+#define CONFIG_BINKA_DEMUXER 1
 #define CONFIG_BIT_DEMUXER 1
 #define CONFIG_BMV_DEMUXER 1
 #define CONFIG_BFSTM_DEMUXER 1
@@ -2513,6 +2528,7 @@
 #define CONFIG_SER_DEMUXER 1
 #define CONFIG_SHORTEN_DEMUXER 1
 #define CONFIG_SIFF_DEMUXER 1
+#define CONFIG_SIMBIOSIS_IMX_DEMUXER 1
 #define CONFIG_SLN_DEMUXER 1
 #define CONFIG_SMACKER_DEMUXER 1
 #define CONFIG_SMJPEG_DEMUXER 1
@@ -2597,6 +2613,7 @@
 #define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_WEBP_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_XBM_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_XPM_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_XWD_PIPE_DEMUXER 1
 #define CONFIG_LIBGME_DEMUXER 1

SMP/libavcodec.vcxproj

@@ -177,7 +177,6 @@
     <ClCompile Include="..\libavcodec\mediacodec.c" />
     <ClCompile Include="..\libavcodec\mpeg12framerate.c" />
     <ClCompile Include="..\libavcodec\options.c" />
-    <ClCompile Include="..\libavcodec\mjpegenc_huffman.c" />
     <ClCompile Include="..\libavcodec\parser.c" />
     <ClCompile Include="..\libavcodec\parsers.c" />
     <ClCompile Include="..\libavcodec\profiles.c" />
@@ -274,7 +273,6 @@
     <ClCompile Include="..\libavcodec\rangecoder.c" />
     <ClCompile Include="..\libavcodec\rdft.c" />
     <ClCompile Include="..\libavcodec\sinewin.c" />
-    <ClCompile Include="..\libavcodec\sinewin_fixed.c" />
     <ClCompile Include="..\libavcodec\snappy.c" />
     <ClCompile Include="..\libavcodec\startcode.c" />
     <ClCompile Include="..\libavcodec\texturedsp.c" />
@@ -341,6 +339,7 @@
     <ClCompile Include="..\libavcodec\amrwbdec.c" />
     <ClCompile Include="..\libavcodec\mjpegenc.c" />
     <ClCompile Include="..\libavcodec\mjpegenc_common.c" />
+    <ClCompile Include="..\libavcodec\mjpegenc_huffman.c" />
     <ClCompile Include="..\libavcodec\anm.c" />
     <ClCompile Include="..\libavcodec\ansi.c" />
     <ClCompile Include="..\libavcodec\cga_data.c" />
@@ -371,7 +370,6 @@
     <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" />
     <ClCompile Include="..\libavcodec\r210enc.c" />
     <ClCompile Include="..\libavcodec\avs.c" />
@@ -403,6 +401,7 @@
     <ClCompile Include="..\libavcodec\cfhd.c" />
     <ClCompile Include="..\libavcodec\cfhddata.c" />
     <ClCompile Include="..\libavcodec\cfhdenc.c" />
+    <ClCompile Include="..\libavcodec\cfhdencdsp.c" />
     <ClCompile Include="..\libavcodec\cinepak.c" />
     <ClCompile Include="..\libavcodec\cinepakenc.c" />
     <ClCompile Include="..\libavcodec\clearvideo.c" />
@@ -474,6 +473,7 @@
     <ClCompile Include="..\libavcodec\escape130.c" />
     <ClCompile Include="..\libavcodec\evrcdec.c" />
     <ClCompile Include="..\libavcodec\exr.c" />
+    <ClCompile Include="..\libavcodec\exrenc.c" />
     <ClCompile Include="..\libavcodec\fastaudio.c" />
     <ClCompile Include="..\libavcodec\ffv1dec.c" />
     <ClCompile Include="..\libavcodec\ffv1.c" />
@@ -499,6 +499,7 @@
     <ClCompile Include="..\libavcodec\frwu.c" />
     <ClCompile Include="..\libavcodec\g2meet.c" />
     <ClCompile Include="..\libavcodec\elsdec.c" />
+    <ClCompile Include="..\libavcodec\mjpegdec_common.c" />
     <ClCompile Include="..\libavcodec\g723_1dec.c" />
     <ClCompile Include="..\libavcodec\g723_1.c" />
     <ClCompile Include="..\libavcodec\g723_1enc.c" />
@@ -593,6 +594,7 @@
     <ClCompile Include="..\libavcodec\lagarithrac.c" />
     <ClCompile Include="..\libavcodec\ljpegenc.c" />
     <ClCompile Include="..\libavcodec\loco.c" />
+    <ClCompile Include="..\libavcodec\lscrdec.c" />
     <ClCompile Include="..\libavcodec\m101.c" />
     <ClCompile Include="..\libavcodec\mace.c" />
     <ClCompile Include="..\libavcodec\magicyuv.c" />
@@ -603,6 +605,7 @@
     <ClCompile Include="..\libavcodec\twinvq.c" />
     <ClCompile Include="..\libavcodec\microdvddec.c" />
     <ClCompile Include="..\libavcodec\mimic.c" />
+    <ClCompile Include="..\libavcodec\mjpegdec.c" />
     <ClCompile Include="..\libavcodec\mjpegbdec.c" />
     <ClCompile Include="..\libavcodec\qsvenc_jpeg.c" />
     <ClCompile Include="..\libavcodec\mlpdec.c" />
@@ -733,6 +736,7 @@
     <ClCompile Include="..\libavcodec\sipr.c" />
     <ClCompile Include="..\libavcodec\sipr16k.c" />
     <ClCompile Include="..\libavcodec\siren.c" />
+    <ClCompile Include="..\libavcodec\imx.c" />
     <ClCompile Include="..\libavcodec\smacker.c" />
     <ClCompile Include="..\libavcodec\smc.c" />
     <ClCompile Include="..\libavcodec\snowdec.c" />
@@ -765,7 +769,6 @@
     <ClCompile Include="..\libavcodec\tiertexseqv.c" />
     <ClCompile Include="..\libavcodec\tiff.c" />
     <ClCompile Include="..\libavcodec\faxcompr.c" />
-    <ClCompile Include="..\libavcodec\tiff_data.c" />
     <ClCompile Include="..\libavcodec\tiffenc.c" />
     <ClCompile Include="..\libavcodec\tmv.c" />
     <ClCompile Include="..\libavcodec\truemotion1.c" />
@@ -926,6 +929,7 @@
     <ClCompile Include="..\libavcodec\bmp_parser.c" />
     <ClCompile Include="..\libavcodec\cavs_parser.c" />
     <ClCompile Include="..\libavcodec\cook_parser.c" />
+    <ClCompile Include="..\libavcodec\cri_parser.c" />
     <ClCompile Include="..\libavcodec\dca_parser.c" />
     <ClCompile Include="..\libavcodec\dirac_parser.c" />
     <ClCompile Include="..\libavcodec\dnxhd_parser.c" />
@@ -964,6 +968,7 @@
     <ClCompile Include="..\libavcodec\vp8_parser.c" />
     <ClCompile Include="..\libavcodec\vp9_parser.c" />
     <ClCompile Include="..\libavcodec\webp_parser.c" />
+    <ClCompile Include="..\libavcodec\xbm_parser.c" />
     <ClCompile Include="..\libavcodec\xma_parser.c" />
     <ClCompile Include="..\libavcodec\aac_adtstoasc_bsf.c" />
     <ClCompile Include="..\libavcodec\av1_metadata_bsf.c" />
@@ -996,6 +1001,7 @@
     <ClCompile Include="..\libavcodec\pcm_rechunk_bsf.c" />
     <ClCompile Include="..\libavcodec\prores_metadata_bsf.c" />
     <ClCompile Include="..\libavcodec\remove_extradata_bsf.c" />
+    <ClCompile Include="..\libavcodec\setts_bsf.c" />
     <ClCompile Include="..\libavcodec\trace_headers_bsf.c" />
     <ClCompile Include="..\libavcodec\truehd_core_bsf.c" />
     <ClCompile Include="..\libavcodec\vp9_metadata_bsf.c" />

SMP/libavcodec.vcxproj.filters

@@ -381,9 +381,6 @@
     <ClCompile Include="..\libavcodec\options.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\mjpegenc_huffman.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavcodec\parser.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -672,9 +669,6 @@
     <ClCompile Include="..\libavcodec\sinewin.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\sinewin_fixed.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavcodec\snappy.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -873,6 +867,9 @@
     <ClCompile Include="..\libavcodec\mjpegenc_common.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\mjpegenc_huffman.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\anm.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -963,9 +960,6 @@
     <ClCompile Include="..\libavcodec\avrndec.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\mjpegdec.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavcodec\r210dec.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -1059,6 +1053,9 @@
     <ClCompile Include="..\libavcodec\cfhdenc.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\cfhdencdsp.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\cinepak.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -1272,6 +1269,9 @@
     <ClCompile Include="..\libavcodec\exr.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\exrenc.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\fastaudio.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -1347,6 +1347,9 @@
     <ClCompile Include="..\libavcodec\elsdec.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\mjpegdec_common.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\g723_1dec.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -1629,6 +1632,9 @@
     <ClCompile Include="..\libavcodec\loco.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\lscrdec.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\m101.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -1659,6 +1665,9 @@
     <ClCompile Include="..\libavcodec\mimic.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\mjpegdec.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\mjpegbdec.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -2049,6 +2058,9 @@
     <ClCompile Include="..\libavcodec\siren.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\imx.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\smacker.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -2145,9 +2157,6 @@
     <ClCompile Include="..\libavcodec\faxcompr.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\tiff_data.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavcodec\tiffenc.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -2628,6 +2637,9 @@
     <ClCompile Include="..\libavcodec\cook_parser.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\cri_parser.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\dca_parser.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -2742,6 +2754,9 @@
     <ClCompile Include="..\libavcodec\webp_parser.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\xbm_parser.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\xma_parser.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -2838,6 +2853,9 @@
     <ClCompile Include="..\libavcodec\remove_extradata_bsf.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\setts_bsf.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\trace_headers_bsf.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>

SMP/libavcodec/bsf_list.c

@@ -48,6 +48,7 @@ static const AVBitStreamFilter *bitstream_filters[] = {
     &ff_pcm_rechunk_bsf,
     &ff_prores_metadata_bsf,
     &ff_remove_extradata_bsf,
+    &ff_setts_bsf,
     &ff_text2movsub_bsf,
     &ff_trace_headers_bsf,
     &ff_truehd_core_bsf,

SMP/libavcodec/codec_list.c

@@ -37,6 +37,7 @@ static const AVCodec *codec_list[] = {
     &ff_dnxhd_encoder,
     &ff_dpx_encoder,
     &ff_dvvideo_encoder,
+    &ff_exr_encoder,
     &ff_ffv1_encoder,
     &ff_ffvhuff_encoder,
     &ff_fits_encoder,
@@ -62,6 +63,7 @@ static const AVCodec *codec_list[] = {
     &ff_pam_encoder,
     &ff_pbm_encoder,
     &ff_pcx_encoder,
+    &ff_pfm_encoder,
     &ff_pgm_encoder,
     &ff_pgmyuv_encoder,
     &ff_png_encoder,
@@ -394,6 +396,7 @@ static const AVCodec *codec_list[] = {
     &ff_sgi_decoder,
     &ff_sgirle_decoder,
     &ff_sheervideo_decoder,
+    &ff_simbiosis_imx_decoder,
     &ff_smacker_decoder,
     &ff_smc_decoder,
     &ff_smvjpeg_decoder,

SMP/libavcodec/dce_defs.c

@@ -186,6 +186,7 @@ void ff_h264qpel_init_aarch64(H264QpelContext *c, int bit_depth) {return;}
 void ff_h264qpel_init_arm(H264QpelContext *c, int bit_depth) {return;}
 void ff_h264qpel_init_mips(H264QpelContext *c, int bit_depth) {return;}
 void ff_h264qpel_init_ppc(H264QpelContext *c, int bit_depth) {return;}
+void ff_hevc_dsp_init_aarch64(HEVCDSPContext *c, const int bit_depth) {return;}
 void ff_hevc_dsp_init_arm(HEVCDSPContext *c, const int bit_depth) {return;}
 void ff_hevc_dsp_init_mips(HEVCDSPContext *c, const int bit_depth) {return;}
 void ff_hevc_dsp_init_ppc(HEVCDSPContext *c, const int bit_depth) {return;}

SMP/libavcodec/parser_list.c

@@ -29,6 +29,7 @@ static const AVCodecParser *parser_list[] = {
     &ff_bmp_parser,
     &ff_cavsvideo_parser,
     &ff_cook_parser,
+    &ff_cri_parser,
     &ff_dca_parser,
     &ff_dirac_parser,
     &ff_dnxhd_parser,
@@ -68,5 +69,6 @@ static const AVCodecParser *parser_list[] = {
     &ff_vp8_parser,
     &ff_vp9_parser,
     &ff_webp_parser,
+    &ff_xbm_parser,
     &ff_xma_parser,
     NULL };
\ No newline at end of file

SMP/libavfilter.vcxproj

@@ -115,6 +115,7 @@
     <ClCompile Include="..\libavfilter\video.c" />
     <ClCompile Include="..\libavfilter\pthread.c" />
     <ClCompile Include="..\libavfilter\qsvvpp.c" />
+    <ClCompile Include="..\libavfilter\dnn_filter_common.c" />
     <ClCompile Include="..\libavfilter\f_bench.c" />
     <ClCompile Include="..\libavfilter\af_sidechaincompress.c" />
     <ClCompile Include="..\libavfilter\af_acontrast.c" />
@@ -130,6 +131,7 @@
     <ClCompile Include="..\libavfilter\af_aecho.c" />
     <ClCompile Include="..\libavfilter\af_aemphasis.c" />
     <ClCompile Include="..\libavfilter\aeval.c" />
+    <ClCompile Include="..\libavfilter\af_aexciter.c" />
     <ClCompile Include="..\libavfilter\af_afftdn.c" />
     <ClCompile Include="..\libavfilter\af_afftfilt.c" />
     <ClCompile Include="..\libavfilter\af_aformat.c" />
@@ -241,6 +243,9 @@
     <ClCompile Include="..\libavfilter\qp_table.c" />
     <ClCompile Include="..\libavfilter\vf_colorbalance.c" />
     <ClCompile Include="..\libavfilter\vf_colorchannelmixer.c" />
+    <ClCompile Include="..\libavfilter\vf_colorcontrast.c" />
+    <ClCompile Include="..\libavfilter\vf_colorcorrect.c" />
+    <ClCompile Include="..\libavfilter\vf_colorize.c" />
     <ClCompile Include="..\libavfilter\vf_colorkey.c" />
     <ClCompile Include="..\libavfilter\vf_colorlevels.c" />
     <ClCompile Include="..\libavfilter\vf_colormatrix.c" />
@@ -281,6 +286,7 @@
     <ClCompile Include="..\libavfilter\vf_entropy.c" />
     <ClCompile Include="..\libavfilter\vf_epx.c" />
     <ClCompile Include="..\libavfilter\vf_estdif.c" />
+    <ClCompile Include="..\libavfilter\vf_exposure.c" />
     <ClCompile Include="..\libavfilter\vf_fade.c" />
     <ClCompile Include="..\libavfilter\vf_fftdnoiz.c" />
     <ClCompile Include="..\libavfilter\vf_fftfilt.c" />
@@ -330,6 +336,7 @@
     <ClCompile Include="..\libavfilter\vf_midequalizer.c" />
     <ClCompile Include="..\libavfilter\vf_minterpolate.c" />
     <ClCompile Include="..\libavfilter\vf_mix.c" />
+    <ClCompile Include="..\libavfilter\vf_monochrome.c" />
     <ClCompile Include="..\libavfilter\vf_mpdecimate.c" />
     <ClCompile Include="..\libavfilter\vf_nlmeans.c" />
     <ClCompile Include="..\libavfilter\vf_nnedi.c" />
@@ -396,6 +403,7 @@
     <ClCompile Include="..\libavfilter\vf_vflip.c" />
     <ClCompile Include="..\libavfilter\vf_vfrdet.c" />
     <ClCompile Include="..\libavfilter\vf_vibrance.c" />
+    <ClCompile Include="..\libavfilter\vf_vif.c" />
     <ClCompile Include="..\libavfilter\vf_vignette.c" />
     <ClCompile Include="..\libavfilter\vf_vmafmotion.c" />
     <ClCompile Include="..\libavfilter\vf_vpp_qsv.c" />

SMP/libavfilter.vcxproj.filters

@@ -198,6 +198,9 @@
     <ClCompile Include="..\libavfilter\qsvvpp.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\dnn_filter_common.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\f_bench.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -243,6 +246,9 @@
     <ClCompile Include="..\libavfilter\aeval.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\af_aexciter.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\af_afftdn.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -576,6 +582,15 @@
     <ClCompile Include="..\libavfilter\vf_colorchannelmixer.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_colorcontrast.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_colorcorrect.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_colorize.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_colorkey.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -696,6 +711,9 @@
     <ClCompile Include="..\libavfilter\vf_estdif.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_exposure.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_fade.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -843,6 +861,9 @@
     <ClCompile Include="..\libavfilter\vf_mix.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_monochrome.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_mpdecimate.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -1041,6 +1062,9 @@
     <ClCompile Include="..\libavfilter\vf_vibrance.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_vif.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_vignette.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>

SMP/libavfilter/filter_list.c

@@ -35,6 +35,7 @@ static const AVFilter *filter_list[] = {
     &ff_af_aecho,
     &ff_af_aemphasis,
     &ff_af_aeval,
+    &ff_af_aexciter,
     &ff_af_afade,
     &ff_af_afftdn,
     &ff_af_afftfilt,
@@ -166,6 +167,9 @@ static const AVFilter *filter_list[] = {
     &ff_vf_codecview,
     &ff_vf_colorbalance,
     &ff_vf_colorchannelmixer,
+    &ff_vf_colorcontrast,
+    &ff_vf_colorcorrect,
+    &ff_vf_colorize,
     &ff_vf_colorkey,
     &ff_vf_colorhold,
     &ff_vf_colorlevels,
@@ -212,6 +216,7 @@ static const AVFilter *filter_list[] = {
     &ff_vf_eq,
     &ff_vf_erosion,
     &ff_vf_estdif,
+    &ff_vf_exposure,
     &ff_vf_extractplanes,
     &ff_vf_fade,
     &ff_vf_fftdnoiz,
@@ -281,6 +286,7 @@ static const AVFilter *filter_list[] = {
     &ff_vf_midequalizer,
     &ff_vf_minterpolate,
     &ff_vf_mix,
+    &ff_vf_monochrome,
     &ff_vf_mpdecimate,
     &ff_vf_negate,
     &ff_vf_nlmeans,
@@ -385,6 +391,7 @@ static const AVFilter *filter_list[] = {
     &ff_vf_vflip,
     &ff_vf_vfrdet,
     &ff_vf_vibrance,
+    &ff_vf_vif,
     &ff_vf_vignette,
     &ff_vf_vmafmotion,
     &ff_vf_vpp_qsv,

SMP/libavformat.vcxproj

@@ -63,7 +63,6 @@
     <ClCompile Include="..\libavformat\allformats.c" />
     <ClCompile Include="..\libavformat\avio.c" />
     <ClCompile Include="..\libavformat\aviobuf.c" />
-    <ClCompile Include="..\libavformat\cutils.c" />
     <ClCompile Include="..\libavformat\dump.c" />
     <ClCompile Include="..\libavformat\format.c" />
     <ClCompile Include="..\libavformat\id3v1.c" />
@@ -72,7 +71,6 @@
     <ClCompile Include="..\libavformat\mux.c" />
     <ClCompile Include="..\libavformat\options.c" />
     <ClCompile Include="..\libavformat\os_support.c" />
-    <ClCompile Include="..\libavformat\qtpalette.c" />
     <ClCompile Include="..\libavformat\protocols.c" />
     <ClCompile Include="..\libavformat\riff.c" />
     <ClCompile Include="..\libavformat\sdp.c" />
@@ -80,6 +78,7 @@
     <ClCompile Include="..\libavformat\utils.c" />
     <ClCompile Include="..\libavformat\file_open.c" />
     <ClCompile Include="..\libavformat\isom.c" />
+    <ClCompile Include="..\libavformat\isom_tags.c" />
     <ClCompile Include="..\libavformat\network.c" />
     <ClCompile Include="..\libavformat\riffdec.c" />
     <ClCompile Include="..\libavformat\riffenc.c" />
@@ -137,6 +136,7 @@
     <ClCompile Include="..\libavformat\pcm.c" />
     <ClCompile Include="..\libavformat\afc.c" />
     <ClCompile Include="..\libavformat\aiffdec.c" />
+    <ClCompile Include="..\libavformat\aiff.c" />
     <ClCompile Include="..\libavformat\mov_chan.c" />
     <ClCompile Include="..\libavformat\replaygain.c" />
     <ClCompile Include="..\libavformat\aiffenc.c" />
@@ -176,13 +176,13 @@
     <ClCompile Include="..\libavformat\avr.c" />
     <ClCompile Include="..\libavformat\avs.c" />
     <ClCompile Include="..\libavformat\voc_packet.c" />
-    <ClCompile Include="..\libavformat\vocdec.c" />
     <ClCompile Include="..\libavformat\voc.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" />
+    <ClCompile Include="..\libavformat\binka.c" />
     <ClCompile Include="..\libavformat\bit.c" />
     <ClCompile Include="..\libavformat\bmv.c" />
     <ClCompile Include="..\libavformat\boadec.c" />
@@ -309,6 +309,7 @@
     <ClCompile Include="..\libavformat\m4vdec.c" />
     <ClCompile Include="..\libavformat\matroskadec.c" />
     <ClCompile Include="..\libavformat\matroska.c" />
+    <ClCompile Include="..\libavformat\qtpalette.c" />
     <ClCompile Include="..\libavformat\matroskaenc.c" />
     <ClCompile Include="..\libavformat\av1.c" />
     <ClCompile Include="..\libavformat\hevc.c" />
@@ -438,6 +439,7 @@
     <ClCompile Include="..\libavformat\serdec.c" />
     <ClCompile Include="..\libavformat\shortendec.c" />
     <ClCompile Include="..\libavformat\siff.c" />
+    <ClCompile Include="..\libavformat\imx.c" />
     <ClCompile Include="..\libavformat\smacker.c" />
     <ClCompile Include="..\libavformat\smjpegdec.c" />
     <ClCompile Include="..\libavformat\smjpeg.c" />
@@ -483,6 +485,7 @@
     <ClCompile Include="..\libavformat\vividas.c" />
     <ClCompile Include="..\libavformat\vivo.c" />
     <ClCompile Include="..\libavformat\sierravmd.c" />
+    <ClCompile Include="..\libavformat\vocdec.c" />
     <ClCompile Include="..\libavformat\vocenc.c" />
     <ClCompile Include="..\libavformat\vpk.c" />
     <ClCompile Include="..\libavformat\vplayerdec.c" />

SMP/libavformat.vcxproj.filters

@@ -40,9 +40,6 @@
     <ClCompile Include="..\libavformat\aviobuf.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavformat\cutils.c">
-      <Filter>Source Files\libavformat</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavformat\dump.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
@@ -67,9 +64,6 @@
     <ClCompile Include="..\libavformat\os_support.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavformat\qtpalette.c">
-      <Filter>Source Files\libavformat</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavformat\protocols.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
@@ -91,6 +85,9 @@
     <ClCompile Include="..\libavformat\isom.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\isom_tags.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\network.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
@@ -262,6 +259,9 @@
     <ClCompile Include="..\libavformat\aiffdec.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\aiff.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\mov_chan.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
@@ -379,9 +379,6 @@
     <ClCompile Include="..\libavformat\voc_packet.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavformat\vocdec.c">
-      <Filter>Source Files\libavformat</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavformat\voc.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
@@ -400,6 +397,9 @@
     <ClCompile Include="..\libavformat\bink.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\binka.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\bit.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
@@ -778,6 +778,9 @@
     <ClCompile Include="..\libavformat\matroska.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\qtpalette.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\matroskaenc.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
@@ -1165,6 +1168,9 @@
     <ClCompile Include="..\libavformat\siff.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\imx.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\smacker.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
@@ -1300,6 +1306,9 @@
     <ClCompile Include="..\libavformat\sierravmd.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\vocdec.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\vocenc.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>

SMP/libavformat/demuxer_list.c

@@ -63,6 +63,7 @@ static const AVInputFormat *demuxer_list[] = {
     &ff_bfi_demuxer,
     &ff_bintext_demuxer,
     &ff_bink_demuxer,
+    &ff_binka_demuxer,
     &ff_bit_demuxer,
     &ff_bmv_demuxer,
     &ff_bfstm_demuxer,
@@ -254,6 +255,7 @@ static const AVInputFormat *demuxer_list[] = {
     &ff_ser_demuxer,
     &ff_shorten_demuxer,
     &ff_siff_demuxer,
+    &ff_simbiosis_imx_demuxer,
     &ff_sln_demuxer,
     &ff_smacker_demuxer,
     &ff_smjpeg_demuxer,
@@ -338,6 +340,7 @@ static const AVInputFormat *demuxer_list[] = {
     &ff_image_sunrast_pipe_demuxer,
     &ff_image_tiff_pipe_demuxer,
     &ff_image_webp_pipe_demuxer,
+    &ff_image_xbm_pipe_demuxer,
     &ff_image_xpm_pipe_demuxer,
     &ff_image_xwd_pipe_demuxer,
     &ff_libgme_demuxer,

SMP/libswscale.vcxproj

@@ -65,6 +65,7 @@
     <NASM Include="..\libswscale\x86\scale.asm" />
     <NASM Include="..\libswscale\x86\rgb_2_rgb.asm" />
     <NASM Include="..\libswscale\x86\yuv_2_rgb.asm" />
+    <NASM Include="..\libswscale\x86\yuv2yuvX.asm" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\libswscale\alphablend.c" />

SMP/libswscale.vcxproj.filters

@@ -49,6 +49,9 @@
     <NASM Include="..\libswscale\x86\yuv_2_rgb.asm">
       <Filter>Source Files\libswscale\x86</Filter>
     </NASM>
+    <NASM Include="..\libswscale\x86\yuv2yuvX.asm">
+      <Filter>Source Files\libswscale\x86</Filter>
+    </NASM>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\libswscale\alphablend.c">