projects: Update for recent upstream merge.

SMP/config.asm

@@ -501,6 +501,7 @@
 %define CONFIG_VAAPI 0
 %define CONFIG_VDA 0
 %define CONFIG_VDPAU 0
+%define CONFIG_VIDEOTOOLBOX 0
 %define CONFIG_XVMC 0
 %define CONFIG_GPL 1
 %define CONFIG_NONFREE 1
@@ -1529,6 +1530,7 @@
 %define CONFIG_ANULLSINK_FILTER 1
 %define CONFIG_ALPHAEXTRACT_FILTER 1
 %define CONFIG_ALPHAMERGE_FILTER 1
+%define CONFIG_ATADENOISE_FILTER 1
 %define CONFIG_ASS_FILTER 1
 %define CONFIG_BBOX_FILTER 1
 %define CONFIG_BLACKDETECT_FILTER 1
@@ -1664,6 +1666,7 @@
 %define CONFIG_YADIF_FILTER 1
 %define CONFIG_ZMQ_FILTER 0
 %define CONFIG_ZOOMPAN_FILTER 1
+%define CONFIG_ALLYUV_FILTER 1
 %define CONFIG_CELLAUTO_FILTER 1
 %define CONFIG_COLOR_FILTER 1
 %define CONFIG_HALDCLUTSRC_FILTER 1
@@ -1688,6 +1691,7 @@
 %define CONFIG_MOVIE_FILTER 1
 %define CONFIG_H263_VAAPI_HWACCEL 0
 %define CONFIG_H263_VDPAU_HWACCEL 0
+%define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0
 %define CONFIG_H264_D3D11VA_HWACCEL 1
 %define CONFIG_H264_DXVA2_HWACCEL 1
 %define CONFIG_H264_MMAL_HWACCEL 0
@@ -1696,20 +1700,24 @@
 %define CONFIG_H264_VDA_HWACCEL 0
 %define CONFIG_H264_VDA_OLD_HWACCEL 0
 %define CONFIG_H264_VDPAU_HWACCEL 0
+%define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0
 %define CONFIG_HEVC_D3D11VA_HWACCEL 1
 %define CONFIG_HEVC_DXVA2_HWACCEL 1
 %define CONFIG_HEVC_QSV_HWACCEL 1
 %define CONFIG_HEVC_VDPAU_HWACCEL 0
 %define CONFIG_MPEG1_XVMC_HWACCEL 0
 %define CONFIG_MPEG1_VDPAU_HWACCEL 0
+%define CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL 0
 %define CONFIG_MPEG2_XVMC_HWACCEL 0
 %define CONFIG_MPEG2_D3D11VA_HWACCEL 1
 %define CONFIG_MPEG2_DXVA2_HWACCEL 1
 %define CONFIG_MPEG2_QSV_HWACCEL 1
 %define CONFIG_MPEG2_VAAPI_HWACCEL 0
 %define CONFIG_MPEG2_VDPAU_HWACCEL 0
+%define CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL 0
 %define CONFIG_MPEG4_VAAPI_HWACCEL 0
 %define CONFIG_MPEG4_VDPAU_HWACCEL 0
+%define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
 %define CONFIG_VC1_D3D11VA_HWACCEL 1
 %define CONFIG_VC1_DXVA2_HWACCEL 1
 %define CONFIG_VC1_VAAPI_HWACCEL 0

SMP/config.h

@@ -548,6 +548,7 @@
 #define CONFIG_VAAPI 0
 #define CONFIG_VDA 0
 #define CONFIG_VDPAU 0
+#define CONFIG_VIDEOTOOLBOX 0
 #define CONFIG_XVMC 0
 #define CONFIG_GPL 1
 #define CONFIG_NONFREE 1
@@ -1576,6 +1577,7 @@
 #define CONFIG_ANULLSINK_FILTER 1
 #define CONFIG_ALPHAEXTRACT_FILTER 1
 #define CONFIG_ALPHAMERGE_FILTER 1
+#define CONFIG_ATADENOISE_FILTER 1
 #define CONFIG_ASS_FILTER 1
 #define CONFIG_BBOX_FILTER 1
 #define CONFIG_BLACKDETECT_FILTER 1
@@ -1711,6 +1713,7 @@
 #define CONFIG_YADIF_FILTER 1
 #define CONFIG_ZMQ_FILTER 0
 #define CONFIG_ZOOMPAN_FILTER 1
+#define CONFIG_ALLYUV_FILTER 1
 #define CONFIG_CELLAUTO_FILTER 1
 #define CONFIG_COLOR_FILTER 1
 #define CONFIG_HALDCLUTSRC_FILTER 1
@@ -1735,6 +1738,7 @@
 #define CONFIG_MOVIE_FILTER 1
 #define CONFIG_H263_VAAPI_HWACCEL 0
 #define CONFIG_H263_VDPAU_HWACCEL 0
+#define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0
 #define CONFIG_H264_D3D11VA_HWACCEL 1
 #define CONFIG_H264_DXVA2_HWACCEL 1
 #define CONFIG_H264_MMAL_HWACCEL 0
@@ -1743,20 +1747,24 @@
 #define CONFIG_H264_VDA_HWACCEL 0
 #define CONFIG_H264_VDA_OLD_HWACCEL 0
 #define CONFIG_H264_VDPAU_HWACCEL 0
+#define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0
 #define CONFIG_HEVC_D3D11VA_HWACCEL 1
 #define CONFIG_HEVC_DXVA2_HWACCEL 1
 #define CONFIG_HEVC_QSV_HWACCEL 1
 #define CONFIG_HEVC_VDPAU_HWACCEL 0
 #define CONFIG_MPEG1_XVMC_HWACCEL 0
 #define CONFIG_MPEG1_VDPAU_HWACCEL 0
+#define CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL 0
 #define CONFIG_MPEG2_XVMC_HWACCEL 0
 #define CONFIG_MPEG2_D3D11VA_HWACCEL 1
 #define CONFIG_MPEG2_DXVA2_HWACCEL 1
 #define CONFIG_MPEG2_QSV_HWACCEL 1
 #define CONFIG_MPEG2_VAAPI_HWACCEL 0
 #define CONFIG_MPEG2_VDPAU_HWACCEL 0
+#define CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL 0
 #define CONFIG_MPEG4_VAAPI_HWACCEL 0
 #define CONFIG_MPEG4_VDPAU_HWACCEL 0
+#define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
 #define CONFIG_VC1_D3D11VA_HWACCEL 1
 #define CONFIG_VC1_DXVA2_HWACCEL 1
 #define CONFIG_VC1_VAAPI_HWACCEL 0

SMP/libavcodec.vcxproj

@@ -1733,6 +1733,7 @@
     <ClInclude Include="..\libavcodec\vda.h" />
     <ClInclude Include="..\libavcodec\vdpau.h" />
     <ClInclude Include="..\libavcodec\version.h" />
+    <ClInclude Include="..\libavcodec\videotoolbox.h" />
     <ClInclude Include="..\libavcodec\vorbis_parser.h" />
     <ClInclude Include="..\libavcodec\xvmc.h" />
   </ItemGroup>
@@ -1995,6 +1996,7 @@ copy ..\libavcodec\vaapi.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vda.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vdpau.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\version.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\videotoolbox.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vorbis_parser.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\xvmc.h $(OutDir)\include\libavcodec
 mkdir $(OutDir)\licenses
@@ -2069,6 +2071,7 @@ copy ..\libavcodec\vaapi.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vda.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vdpau.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\version.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\videotoolbox.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vorbis_parser.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\xvmc.h $(OutDir)\include\libavcodec
 mkdir $(OutDir)\licenses
@@ -2150,6 +2153,7 @@ copy ..\libavcodec\vaapi.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vda.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vdpau.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\version.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\videotoolbox.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vorbis_parser.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\xvmc.h $(OutDir)\include\libavcodec
 mkdir $(OutDir)\licenses
@@ -2234,6 +2238,7 @@ copy ..\libavcodec\vaapi.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vda.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vdpau.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\version.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\videotoolbox.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vorbis_parser.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\xvmc.h $(OutDir)\include\libavcodec
 mkdir $(OutDir)\licenses
@@ -2320,6 +2325,7 @@ copy ..\libavcodec\vaapi.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vda.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vdpau.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\version.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\videotoolbox.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vorbis_parser.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\xvmc.h $(OutDir)\include\libavcodec
 mkdir $(OutDir)\licenses
@@ -2404,6 +2410,7 @@ copy ..\libavcodec\vaapi.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vda.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vdpau.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\version.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\videotoolbox.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vorbis_parser.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\xvmc.h $(OutDir)\include\libavcodec
 mkdir $(OutDir)\licenses
@@ -2492,6 +2499,7 @@ copy ..\libavcodec\vaapi.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vda.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vdpau.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\version.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\videotoolbox.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vorbis_parser.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\xvmc.h $(OutDir)\include\libavcodec
 mkdir $(OutDir)\licenses
@@ -2574,6 +2582,7 @@ copy ..\libavcodec\vaapi.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vda.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vdpau.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\version.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\videotoolbox.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vorbis_parser.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\xvmc.h $(OutDir)\include\libavcodec
 mkdir $(OutDir)\licenses
@@ -2663,6 +2672,7 @@ copy ..\libavcodec\vaapi.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vda.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vdpau.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\version.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\videotoolbox.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vorbis_parser.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\xvmc.h $(OutDir)\include\libavcodec
 mkdir $(OutDir)\licenses
@@ -2750,6 +2760,7 @@ copy ..\libavcodec\vaapi.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vda.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vdpau.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\version.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\videotoolbox.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vorbis_parser.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\xvmc.h $(OutDir)\include\libavcodec
 mkdir $(OutDir)\licenses
@@ -2839,6 +2850,7 @@ copy ..\libavcodec\vaapi.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vda.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vdpau.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\version.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\videotoolbox.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vorbis_parser.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\xvmc.h $(OutDir)\include\libavcodec
 mkdir $(OutDir)\licenses
@@ -2926,6 +2938,7 @@ copy ..\libavcodec\vaapi.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vda.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vdpau.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\version.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\videotoolbox.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vorbis_parser.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\xvmc.h $(OutDir)\include\libavcodec
 mkdir $(OutDir)\licenses
@@ -3008,6 +3021,7 @@ copy ..\libavcodec\vaapi.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vda.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vdpau.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\version.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\videotoolbox.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vorbis_parser.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\xvmc.h $(OutDir)\include\libavcodec
 mkdir $(OutDir)\licenses
@@ -3089,6 +3103,7 @@ copy ..\libavcodec\vaapi.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vda.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vdpau.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\version.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\videotoolbox.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\vorbis_parser.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\xvmc.h $(OutDir)\include\libavcodec
 mkdir $(OutDir)\licenses

SMP/libavcodec.vcxproj.filters

@@ -2587,6 +2587,9 @@
     <ClInclude Include="..\libavcodec\version.h">
       <Filter>Header Files\libavcodec</Filter>
     </ClInclude>
+    <ClInclude Include="..\libavcodec\videotoolbox.h">
+      <Filter>Header Files\libavcodec</Filter>
+    </ClInclude>
     <ClInclude Include="..\libavcodec\vorbis_parser.h">
       <Filter>Header Files\libavcodec</Filter>
     </ClInclude>

SMP/libavfilter.vcxproj

@@ -210,6 +210,8 @@
     </ClCompile>
     <ClCompile Include="..\libavfilter\vf_alphamerge.c">
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_atadenoise.c">
+    </ClCompile>
     <ClCompile Include="..\libavfilter\bbox.c">
     </ClCompile>
     <ClCompile Include="..\libavfilter\vf_bbox.c">
@@ -449,10 +451,10 @@
     </ClCompile>
     <ClCompile Include="..\libavfilter\vf_zoompan.c">
     </ClCompile>
-    <ClCompile Include="..\libavfilter\vsrc_cellauto.c">
-    </ClCompile>
     <ClCompile Include="..\libavfilter\vsrc_testsrc.c">
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vsrc_cellauto.c">
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vsrc_life.c">
     </ClCompile>
     <ClCompile Include="..\libavfilter\vsrc_mandelbrot.c">

SMP/libavfilter.vcxproj.filters

@@ -266,6 +266,9 @@
     <ClCompile Include="..\libavfilter\vf_alphamerge.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_atadenoise.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\bbox.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -608,10 +611,10 @@
     <ClCompile Include="..\libavfilter\vf_zoompan.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavfilter\vsrc_cellauto.c">
+    <ClCompile Include="..\libavfilter\vsrc_testsrc.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavfilter\vsrc_testsrc.c">
+    <ClCompile Include="..\libavfilter\vsrc_cellauto.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
     <ClCompile Include="..\libavfilter\vsrc_life.c">