projects: Update for recent upstream merge.

SMP/config.asm

@@ -993,6 +993,7 @@
 %define CONFIG_ATRAC3AL_DECODER 1
 %define CONFIG_ATRAC3P_DECODER 1
 %define CONFIG_ATRAC3PAL_DECODER 1
+%define CONFIG_ATRAC9_DECODER 1
 %define CONFIG_BINKAUDIO_DCT_DECODER 1
 %define CONFIG_BINKAUDIO_RDFT_DECODER 1
 %define CONFIG_BMV_AUDIO_DECODER 1
@@ -1812,6 +1813,7 @@
 %define CONFIG_PP7_FILTER 1
 %define CONFIG_PREMULTIPLY_FILTER 1
 %define CONFIG_PREWITT_FILTER 1
+%define CONFIG_PREWITT_OPENCL_FILTER 0
 %define CONFIG_PROCAMP_VAAPI_FILTER 0
 %define CONFIG_PROGRAM_OPENCL_FILTER 0
 %define CONFIG_PSEUDOCOLOR_FILTER 1
@@ -1828,6 +1830,7 @@
 %define CONFIG_REPEATFIELDS_FILTER 1
 %define CONFIG_REVERSE_FILTER 1
 %define CONFIG_ROBERTS_FILTER 1
+%define CONFIG_ROBERTS_OPENCL_FILTER 0
 %define CONFIG_ROTATE_FILTER 1
 %define CONFIG_SAB_FILTER 1
 %define CONFIG_SCALE_FILTER 1
@@ -1856,9 +1859,10 @@
 %define CONFIG_SIGNATURE_FILTER 1
 %define CONFIG_SMARTBLUR_FILTER 1
 %define CONFIG_SOBEL_FILTER 1
+%define CONFIG_SOBEL_OPENCL_FILTER 0
 %define CONFIG_SPLIT_FILTER 1
 %define CONFIG_SPP_FILTER 1
-%define CONFIG_SRCNN_FILTER 1
+%define CONFIG_SR_FILTER 1
 %define CONFIG_SSIM_FILTER 1
 %define CONFIG_STEREO3D_FILTER 1
 %define CONFIG_STREAMSELECT_FILTER 1

SMP/config.h

@@ -1058,6 +1058,7 @@
 #define CONFIG_ATRAC3AL_DECODER 1
 #define CONFIG_ATRAC3P_DECODER 1
 #define CONFIG_ATRAC3PAL_DECODER 1
+#define CONFIG_ATRAC9_DECODER 1
 #define CONFIG_BINKAUDIO_DCT_DECODER 1
 #define CONFIG_BINKAUDIO_RDFT_DECODER 1
 #define CONFIG_BMV_AUDIO_DECODER 1
@@ -1898,6 +1899,7 @@
 #define CONFIG_PP7_FILTER 1
 #define CONFIG_PREMULTIPLY_FILTER 1
 #define CONFIG_PREWITT_FILTER 1
+#define CONFIG_PREWITT_OPENCL_FILTER 0
 #define CONFIG_PROCAMP_VAAPI_FILTER 0
 #define CONFIG_PROGRAM_OPENCL_FILTER 0
 #define CONFIG_PSEUDOCOLOR_FILTER 1
@@ -1914,6 +1916,7 @@
 #define CONFIG_REPEATFIELDS_FILTER 1
 #define CONFIG_REVERSE_FILTER 1
 #define CONFIG_ROBERTS_FILTER 1
+#define CONFIG_ROBERTS_OPENCL_FILTER 0
 #define CONFIG_ROTATE_FILTER 1
 #define CONFIG_SAB_FILTER 1
 #define CONFIG_SCALE_FILTER 1
@@ -1942,9 +1945,10 @@
 #define CONFIG_SIGNATURE_FILTER 1
 #define CONFIG_SMARTBLUR_FILTER 1
 #define CONFIG_SOBEL_FILTER 1
+#define CONFIG_SOBEL_OPENCL_FILTER 0
 #define CONFIG_SPLIT_FILTER 1
 #define CONFIG_SPP_FILTER 1
-#define CONFIG_SRCNN_FILTER 1
+#define CONFIG_SR_FILTER 1
 #define CONFIG_SSIM_FILTER 1
 #define CONFIG_STEREO3D_FILTER 1
 #define CONFIG_STREAMSELECT_FILTER 1

SMP/libavcodec.vcxproj

@@ -356,6 +356,7 @@
     <ClCompile Include="..\libavcodec\atrac3plusdec.c" />
     <ClCompile Include="..\libavcodec\atrac3plus.c" />
     <ClCompile Include="..\libavcodec\atrac3plusdsp.c" />
+    <ClCompile Include="..\libavcodec\atrac9dec.c" />
     <ClCompile Include="..\libavcodec\cyuv.c" />
     <ClCompile Include="..\libavcodec\aura.c" />
     <ClCompile Include="..\libavcodec\avrndec.c" />

SMP/libavcodec.vcxproj.filters

@@ -891,6 +891,9 @@
     <ClCompile Include="..\libavcodec\atrac3plusdsp.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\atrac9dec.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\cyuv.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>

SMP/libavcodec/codec_list.c

@@ -444,6 +444,7 @@ static const AVCodec *codec_list[] = {
     &ff_atrac3al_decoder,
     &ff_atrac3p_decoder,
     &ff_atrac3pal_decoder,
+    &ff_atrac9_decoder,
     &ff_binkaudio_dct_decoder,
     &ff_binkaudio_rdft_decoder,
     &ff_bmv_audio_decoder,

SMP/libavfilter.vcxproj

@@ -340,7 +340,7 @@
     <ClCompile Include="..\libavfilter\vf_signature.c" />
     <ClCompile Include="..\libavfilter\vf_smartblur.c" />
     <ClCompile Include="..\libavfilter\vf_spp.c" />
-    <ClCompile Include="..\libavfilter\vf_srcnn.c" />
+    <ClCompile Include="..\libavfilter\vf_sr.c" />
     <ClCompile Include="..\libavfilter\vf_super2xsai.c" />
     <ClCompile Include="..\libavfilter\vf_swaprect.c" />
     <ClCompile Include="..\libavfilter\vf_swapuv.c" />

SMP/libavfilter.vcxproj.filters

@@ -843,7 +843,7 @@
     <ClCompile Include="..\libavfilter\vf_spp.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavfilter\vf_srcnn.c">
+    <ClCompile Include="..\libavfilter\vf_sr.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
     <ClCompile Include="..\libavfilter\vf_super2xsai.c">

SMP/libavfilter/filter_list.c

@@ -296,7 +296,7 @@ static const AVFilter *filter_list[] = {
     &ff_vf_sobel,
     &ff_vf_split,
     &ff_vf_spp,
-    &ff_vf_srcnn,
+    &ff_vf_sr,
     &ff_vf_ssim,
     &ff_vf_stereo3d,
     &ff_vf_streamselect,