projects: Update for recent upstream merge.

SMP/config.asm

@@ -427,6 +427,7 @@
 %define CONFIG_AVISYNTH 1
 %define CONFIG_FREI0R 0
 %define CONFIG_LIBCDIO 1
+%define CONFIG_LIBDAVS2 0
 %define CONFIG_LIBRUBBERBAND 0
 %define CONFIG_LIBVIDSTAB 0
 %define CONFIG_LIBX264 1
@@ -439,6 +440,7 @@
 %define CONFIG_OPENSSL 0
 %define CONFIG_LIBTLS 0
 %define CONFIG_GMP 1
+%define CONFIG_LIBLENSFUN 0
 %define CONFIG_LIBOPENCORE_AMRNB 0
 %define CONFIG_LIBOPENCORE_AMRWB 0
 %define CONFIG_LIBVMAF 0
@@ -1185,6 +1187,7 @@
 %define CONFIG_LIBAOM_AV1_DECODER 0
 %define CONFIG_LIBCELT_DECODER 0
 %define CONFIG_LIBCODEC2_DECODER 0
+%define CONFIG_LIBDAVS2_DECODER 0
 %define CONFIG_LIBFDK_AAC_DECODER 0
 %define CONFIG_LIBGSM_DECODER 0
 %define CONFIG_LIBGSM_MS_DECODER 0
@@ -1486,6 +1489,7 @@
 %define CONFIG_AAC_LATM_PARSER 1
 %define CONFIG_AC3_PARSER 1
 %define CONFIG_ADX_PARSER 1
+%define CONFIG_AVS2_PARSER 1
 %define CONFIG_BMP_PARSER 1
 %define CONFIG_CAVSVIDEO_PARSER 1
 %define CONFIG_COOK_PARSER 1
@@ -1748,6 +1752,7 @@
 %define CONFIG_GBLUR_FILTER 1
 %define CONFIG_GEQ_FILTER 1
 %define CONFIG_GRADFUN_FILTER 1
+%define CONFIG_GREYEDGE_FILTER 1
 %define CONFIG_HALDCLUT_FILTER 1
 %define CONFIG_HFLIP_FILTER 1
 %define CONFIG_HISTEQ_FILTER 1
@@ -1768,6 +1773,7 @@
 %define CONFIG_INTERLEAVE_FILTER 1
 %define CONFIG_KERNDEINT_FILTER 1
 %define CONFIG_LENSCORRECTION_FILTER 1
+%define CONFIG_LENSFUN_FILTER 0
 %define CONFIG_LIBVMAF_FILTER 0
 %define CONFIG_LIMITER_FILTER 1
 %define CONFIG_LOOP_FILTER 1

SMP/config.h

@@ -477,6 +477,7 @@
 #define CONFIG_AVISYNTH 1
 #define CONFIG_FREI0R 0
 #define CONFIG_LIBCDIO 1
+#define CONFIG_LIBDAVS2 0
 #define CONFIG_LIBRUBBERBAND 0
 #define CONFIG_LIBVIDSTAB 0
 #define CONFIG_LIBX264 1
@@ -489,6 +490,7 @@
 #define CONFIG_OPENSSL 0
 #define CONFIG_LIBTLS 0
 #define CONFIG_GMP 1
+#define CONFIG_LIBLENSFUN 0
 #define CONFIG_LIBOPENCORE_AMRNB 0
 #define CONFIG_LIBOPENCORE_AMRWB 0
 #define CONFIG_LIBVMAF 0
@@ -1250,6 +1252,7 @@
 #define CONFIG_LIBAOM_AV1_DECODER 0
 #define CONFIG_LIBCELT_DECODER 0
 #define CONFIG_LIBCODEC2_DECODER 0
+#define CONFIG_LIBDAVS2_DECODER 0
 #define CONFIG_LIBFDK_AAC_DECODER 0
 #define CONFIG_LIBGSM_DECODER 0
 #define CONFIG_LIBGSM_MS_DECODER 0
@@ -1572,6 +1575,7 @@
 #define CONFIG_AAC_LATM_PARSER 1
 #define CONFIG_AC3_PARSER 1
 #define CONFIG_ADX_PARSER 1
+#define CONFIG_AVS2_PARSER 1
 #define CONFIG_BMP_PARSER 1
 #define CONFIG_CAVSVIDEO_PARSER 1
 #define CONFIG_COOK_PARSER 1
@@ -1834,6 +1838,7 @@
 #define CONFIG_GBLUR_FILTER 1
 #define CONFIG_GEQ_FILTER 1
 #define CONFIG_GRADFUN_FILTER 1
+#define CONFIG_GREYEDGE_FILTER 1
 #define CONFIG_HALDCLUT_FILTER 1
 #define CONFIG_HFLIP_FILTER 1
 #define CONFIG_HISTEQ_FILTER 1
@@ -1854,6 +1859,7 @@
 #define CONFIG_INTERLEAVE_FILTER 1
 #define CONFIG_KERNDEINT_FILTER 1
 #define CONFIG_LENSCORRECTION_FILTER 1
+#define CONFIG_LENSFUN_FILTER 0
 #define CONFIG_LIBVMAF_FILTER 0
 #define CONFIG_LIMITER_FILTER 1
 #define CONFIG_LOOP_FILTER 1

SMP/libavcodec.vcxproj

@@ -186,6 +186,7 @@
     <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" />
     <ClCompile Include="..\libavcodec\qsv_api.c" />
     <ClCompile Include="..\libavcodec\raw.c" />
@@ -886,6 +887,7 @@
     <ClCompile Include="..\libavcodec\aac_parser.c" />
     <ClCompile Include="..\libavcodec\aac_ac3_parser.c" />
     <ClCompile Include="..\libavcodec\adx_parser.c" />
+    <ClCompile Include="..\libavcodec\avs2_parser.c" />
     <ClCompile Include="..\libavcodec\bmp_parser.c" />
     <ClCompile Include="..\libavcodec\cavs_parser.c" />
     <ClCompile Include="..\libavcodec\cook_parser.c" />
@@ -927,6 +929,7 @@
     <ClCompile Include="..\libavcodec\dca_core_bsf.c" />
     <ClCompile Include="..\libavcodec\eac3_core_bsf.c" />
     <ClCompile Include="..\libavcodec\extract_extradata_bsf.c" />
+    <ClCompile Include="..\libavcodec\av1_parse.c" />
     <ClCompile Include="..\libavcodec\filter_units_bsf.c" />
     <ClCompile Include="..\libavcodec\h264_metadata_bsf.c" />
     <ClCompile Include="..\libavcodec\h264_mp4toannexb_bsf.c" />

SMP/libavcodec.vcxproj.filters

@@ -381,6 +381,9 @@
     <ClCompile Include="..\libavcodec\parser.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\parsers.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\profiles.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -2481,6 +2484,9 @@
     <ClCompile Include="..\libavcodec\adx_parser.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\avs2_parser.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\bmp_parser.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -2604,6 +2610,9 @@
     <ClCompile Include="..\libavcodec\extract_extradata_bsf.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\av1_parse.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\filter_units_bsf.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>

SMP/libavcodec/parser_list.c

@@ -23,6 +23,7 @@ static const AVCodecParser *parser_list[] = {
     &ff_aac_latm_parser,
     &ff_ac3_parser,
     &ff_adx_parser,
+    &ff_avs2_parser,
     &ff_bmp_parser,
     &ff_cavsvideo_parser,
     &ff_cook_parser,

SMP/libavfilter.vcxproj

@@ -271,6 +271,7 @@
     <ClCompile Include="..\libavfilter\vf_framestep.c" />
     <ClCompile Include="..\libavfilter\vf_gblur.c" />
     <ClCompile Include="..\libavfilter\vf_geq.c" />
+    <ClCompile Include="..\libavfilter\vf_colorconstancy.c" />
     <ClCompile Include="..\libavfilter\vf_lut3d.c" />
     <ClCompile Include="..\libavfilter\vf_histeq.c" />
     <ClCompile Include="..\libavfilter\vf_histogram.c" />

SMP/libavfilter.vcxproj.filters

@@ -636,6 +636,9 @@
     <ClCompile Include="..\libavfilter\vf_geq.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_colorconstancy.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_lut3d.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>

SMP/libavfilter/filter_list.c

@@ -195,6 +195,7 @@ static const AVFilter *filter_list[] = {
     &ff_vf_gblur,
     &ff_vf_geq,
     &ff_vf_gradfun,
+    &ff_vf_greyedge,
     &ff_vf_haldclut,
     &ff_vf_hflip,
     &ff_vf_histeq,

SMP/libavformat.vcxproj

@@ -316,6 +316,7 @@
     <ClCompile Include="..\libavformat\mmf.c" />
     <ClCompile Include="..\libavformat\mov.c" />
     <ClCompile Include="..\libavformat\movenc.c" />
+    <ClCompile Include="..\libavformat\av1.c" />
     <ClCompile Include="..\libavformat\vpcc.c" />
     <ClCompile Include="..\libavformat\movenchint.c" />
     <ClCompile Include="..\libavformat\movenccenc.c" />

SMP/libavformat.vcxproj.filters

@@ -772,6 +772,9 @@
     <ClCompile Include="..\libavformat\movenc.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\av1.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\vpcc.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>