project: Update for recent upstream merge.

SMP/config.asm

@@ -723,6 +723,7 @@
 %define CONFIG_CDXL_DECODER 1
 %define CONFIG_CFHD_DECODER 1
 %define CONFIG_CINEPAK_DECODER 1
+%define CONFIG_CLEARVIDEO_DECODER 1
 %define CONFIG_CLJR_DECODER 1
 %define CONFIG_CLLC_DECODER 1
 %define CONFIG_COMFORTNOISE_DECODER 1
@@ -862,6 +863,7 @@
 %define CONFIG_RV40_DECODER 1
 %define CONFIG_S302M_DECODER 1
 %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
@@ -1765,6 +1767,7 @@
 %define CONFIG_DEBAND_FILTER 1
 %define CONFIG_DECIMATE_FILTER 1
 %define CONFIG_DEFLATE_FILTER 1
+%define CONFIG_DEINTERLACE_VAAPI_FILTER 0
 %define CONFIG_DEJUDDER_FILTER 1
 %define CONFIG_DELOGO_FILTER 1
 %define CONFIG_DESHAKE_FILTER 1

SMP/config.h

@@ -778,6 +778,7 @@
 #define CONFIG_CDXL_DECODER 1
 #define CONFIG_CFHD_DECODER 1
 #define CONFIG_CINEPAK_DECODER 1
+#define CONFIG_CLEARVIDEO_DECODER 1
 #define CONFIG_CLJR_DECODER 1
 #define CONFIG_CLLC_DECODER 1
 #define CONFIG_COMFORTNOISE_DECODER 1
@@ -917,6 +918,7 @@
 #define CONFIG_RV40_DECODER 1
 #define CONFIG_S302M_DECODER 1
 #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
@@ -1820,6 +1822,7 @@
 #define CONFIG_DEBAND_FILTER 1
 #define CONFIG_DECIMATE_FILTER 1
 #define CONFIG_DEFLATE_FILTER 1
+#define CONFIG_DEINTERLACE_VAAPI_FILTER 0
 #define CONFIG_DEJUDDER_FILTER 1
 #define CONFIG_DELOGO_FILTER 1
 #define CONFIG_DESHAKE_FILTER 1

SMP/libavcodec.vcxproj

@@ -373,6 +373,7 @@
     <ClCompile Include="..\libavcodec\cfhddata.c" />
     <ClCompile Include="..\libavcodec\cinepak.c" />
     <ClCompile Include="..\libavcodec\cinepakenc.c" />
+    <ClCompile Include="..\libavcodec\clearvideo.c" />
     <ClCompile Include="..\libavcodec\cljrdec.c" />
     <ClCompile Include="..\libavcodec\cljrenc.c" />
     <ClCompile Include="..\libavcodec\cllc.c" />
@@ -666,6 +667,7 @@
     <ClCompile Include="..\libavcodec\s302m.c" />
     <ClCompile Include="..\libavcodec\s302menc.c" />
     <ClCompile Include="..\libavcodec\sanm.c" />
+    <ClCompile Include="..\libavcodec\scpr.c" />
     <ClCompile Include="..\libavcodec\screenpresso.c" />
     <ClCompile Include="..\libavcodec\sgidec.c" />
     <ClCompile Include="..\libavcodec\sgienc.c" />

SMP/libavcodec.vcxproj.filters

@@ -942,6 +942,9 @@
     <ClCompile Include="..\libavcodec\cinepakenc.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\clearvideo.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\cljrdec.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -1821,6 +1824,9 @@
     <ClCompile Include="..\libavcodec\sanm.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\scpr.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\screenpresso.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>

SMP/libavfilter/dce_defs.c

@@ -196,6 +196,7 @@ AVFilter ff_af_rubberband = {0};
 AVFilter ff_af_sofalizer = {0};
 AVFilter ff_asrc_flite = {0};
 AVFilter ff_vf_coreimage = {0};
+AVFilter ff_vf_deinterlace_vaapi = {0};
 AVFilter ff_vf_frei0r = {0};
 AVFilter ff_vf_ocr = {0};
 AVFilter ff_vf_ocv = {0};