projects: Update for recent upstream merge.

SMP/config.asm

@@ -371,6 +371,7 @@
 %define HAVE_XFORM_ASM 0
 %define HAVE_XMM_CLOBBERS 1
 %define HAVE_KCMVIDEOCODECTYPE_HEVC 0
+%define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0
 %define HAVE_SOCKLEN_T 1
 %define HAVE_STRUCT_ADDRINFO 1
 %define HAVE_STRUCT_GROUP_SOURCE_REQ 1
@@ -510,6 +511,7 @@
 %define CONFIG_MEDIACODEC 0
 %define CONFIG_OPENAL 0
 %define CONFIG_OPENGL 1
+%define CONFIG_POCKETSPHINX 0
 %define CONFIG_VAPOURSYNTH 0
 %define CONFIG_ALSA 0
 %define CONFIG_APPKIT 0
@@ -1640,7 +1642,9 @@
 %define CONFIG_ASETTB_FILTER 1
 %define CONFIG_ASHOWINFO_FILTER 1
 %define CONFIG_ASIDEDATA_FILTER 1
+%define CONFIG_ASOFTCLIP_FILTER 1
 %define CONFIG_ASPLIT_FILTER 1
+%define CONFIG_ASR_FILTER 0
 %define CONFIG_ASTATS_FILTER 1
 %define CONFIG_ASTREAMSELECT_FILTER 1
 %define CONFIG_ATEMPO_FILTER 1
@@ -1730,6 +1734,8 @@
 %define CONFIG_COLORBALANCE_FILTER 1
 %define CONFIG_COLORCHANNELMIXER_FILTER 1
 %define CONFIG_COLORKEY_FILTER 1
+%define CONFIG_COLORKEY_OPENCL_FILTER 0
+%define CONFIG_COLORHOLD_FILTER 1
 %define CONFIG_COLORLEVELS_FILTER 1
 %define CONFIG_COLORMATRIX_FILTER 1
 %define CONFIG_COLORSPACE_FILTER 1
@@ -1817,6 +1823,7 @@
 %define CONFIG_INTERLACE_FILTER 1
 %define CONFIG_INTERLEAVE_FILTER 1
 %define CONFIG_KERNDEINT_FILTER 1
+%define CONFIG_LAGFUN_FILTER 1
 %define CONFIG_LENSCORRECTION_FILTER 1
 %define CONFIG_LENSFUN_FILTER 0
 %define CONFIG_LIBVMAF_FILTER 0
@@ -1961,6 +1968,7 @@
 %define CONFIG_WAVEFORM_FILTER 1
 %define CONFIG_WEAVE_FILTER 1
 %define CONFIG_XBR_FILTER 1
+%define CONFIG_XMEDIAN_FILTER 1
 %define CONFIG_XSTACK_FILTER 1
 %define CONFIG_YADIF_FILTER 1
 %define CONFIG_YADIF_CUDA_FILTER 0

SMP/config.h

@@ -425,6 +425,7 @@
 #define HAVE_XFORM_ASM 0
 #define HAVE_XMM_CLOBBERS 1
 #define HAVE_KCMVIDEOCODECTYPE_HEVC 0
+#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0
 #define HAVE_SOCKLEN_T 1
 #define HAVE_STRUCT_ADDRINFO 1
 #define HAVE_STRUCT_GROUP_SOURCE_REQ 1
@@ -568,6 +569,7 @@
 #define CONFIG_MEDIACODEC 0
 #define CONFIG_OPENAL 0
 #define CONFIG_OPENGL 1
+#define CONFIG_POCKETSPHINX 0
 #define CONFIG_VAPOURSYNTH 0
 #define CONFIG_ALSA 0
 #define CONFIG_APPKIT 0
@@ -1762,7 +1764,9 @@
 #define CONFIG_ASETTB_FILTER 1
 #define CONFIG_ASHOWINFO_FILTER 1
 #define CONFIG_ASIDEDATA_FILTER 1
+#define CONFIG_ASOFTCLIP_FILTER 1
 #define CONFIG_ASPLIT_FILTER 1
+#define CONFIG_ASR_FILTER 0
 #define CONFIG_ASTATS_FILTER 1
 #define CONFIG_ASTREAMSELECT_FILTER 1
 #define CONFIG_ATEMPO_FILTER 1
@@ -1852,6 +1856,8 @@
 #define CONFIG_COLORBALANCE_FILTER 1
 #define CONFIG_COLORCHANNELMIXER_FILTER 1
 #define CONFIG_COLORKEY_FILTER 1
+#define CONFIG_COLORKEY_OPENCL_FILTER 0
+#define CONFIG_COLORHOLD_FILTER 1
 #define CONFIG_COLORLEVELS_FILTER 1
 #define CONFIG_COLORMATRIX_FILTER 1
 #define CONFIG_COLORSPACE_FILTER 1
@@ -1939,6 +1945,7 @@
 #define CONFIG_INTERLACE_FILTER 1
 #define CONFIG_INTERLEAVE_FILTER 1
 #define CONFIG_KERNDEINT_FILTER 1
+#define CONFIG_LAGFUN_FILTER 1
 #define CONFIG_LENSCORRECTION_FILTER 1
 #define CONFIG_LENSFUN_FILTER 0
 #define CONFIG_LIBVMAF_FILTER 0
@@ -2083,6 +2090,7 @@
 #define CONFIG_WAVEFORM_FILTER 1
 #define CONFIG_WEAVE_FILTER 1
 #define CONFIG_XBR_FILTER 1
+#define CONFIG_XMEDIAN_FILTER 1
 #define CONFIG_XSTACK_FILTER 1
 #define CONFIG_YADIF_FILTER 1
 #define CONFIG_YADIF_CUDA_FILTER 0

SMP/libavcodec.vcxproj

@@ -916,6 +916,7 @@
     <ClCompile Include="..\libavcodec\h264_parser.c" />
     <ClCompile Include="..\libavcodec\hevc_parser.c" />
     <ClCompile Include="..\libavcodec\mjpeg_parser.c" />
+    <ClCompile Include="..\libavcodec\mlp_parse.c" />
     <ClCompile Include="..\libavcodec\mlp_parser.c" />
     <ClCompile Include="..\libavcodec\mpeg4video_parser.c" />
     <ClCompile Include="..\libavcodec\png_parser.c" />

SMP/libavcodec.vcxproj.filters

@@ -2595,6 +2595,9 @@
     <ClCompile Include="..\libavcodec\mjpeg_parser.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\mlp_parse.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\mlp_parser.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>

SMP/libavfilter.vcxproj

@@ -156,6 +156,7 @@
     <ClCompile Include="..\libavfilter\settb.c" />
     <ClCompile Include="..\libavfilter\af_ashowinfo.c" />
     <ClCompile Include="..\libavfilter\f_sidedata.c" />
+    <ClCompile Include="..\libavfilter\af_asoftclip.c" />
     <ClCompile Include="..\libavfilter\split.c" />
     <ClCompile Include="..\libavfilter\af_astats.c" />
     <ClCompile Include="..\libavfilter\f_streamselect.c" />
@@ -291,6 +292,7 @@
     <ClCompile Include="..\libavfilter\vf_il.c" />
     <ClCompile Include="..\libavfilter\vf_tinterlace.c" />
     <ClCompile Include="..\libavfilter\vf_kerndeint.c" />
+    <ClCompile Include="..\libavfilter\vf_lagfun.c" />
     <ClCompile Include="..\libavfilter\vf_lenscorrection.c" />
     <ClCompile Include="..\libavfilter\vf_lumakey.c" />
     <ClCompile Include="..\libavfilter\vf_lut.c" />
@@ -368,6 +370,7 @@
     <ClCompile Include="..\libavfilter\vf_vpp_qsv.c" />
     <ClCompile Include="..\libavfilter\vf_waveform.c" />
     <ClCompile Include="..\libavfilter\vf_xbr.c" />
+    <ClCompile Include="..\libavfilter\vf_xmedian.c" />
     <ClCompile Include="..\libavfilter\vf_zoompan.c" />
     <ClCompile Include="..\libavfilter\vsrc_testsrc.c" />
     <ClCompile Include="..\libavfilter\vsrc_cellauto.c" />

SMP/libavfilter.vcxproj.filters

@@ -315,6 +315,9 @@
     <ClCompile Include="..\libavfilter\f_sidedata.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\af_asoftclip.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\split.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -720,6 +723,9 @@
     <ClCompile Include="..\libavfilter\vf_kerndeint.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_lagfun.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_lenscorrection.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -951,6 +957,9 @@
     <ClCompile Include="..\libavfilter\vf_xbr.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_xmedian.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_zoompan.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>

SMP/libavfilter/filter_list.c

@@ -68,6 +68,7 @@ static const AVFilter *filter_list[] = {
     &ff_af_asettb,
     &ff_af_ashowinfo,
     &ff_af_asidedata,
+    &ff_af_asoftclip,
     &ff_af_asplit,
     &ff_af_astats,
     &ff_af_astreamselect,
@@ -148,6 +149,7 @@ static const AVFilter *filter_list[] = {
     &ff_vf_colorbalance,
     &ff_vf_colorchannelmixer,
     &ff_vf_colorkey,
+    &ff_vf_colorhold,
     &ff_vf_colorlevels,
     &ff_vf_colormatrix,
     &ff_vf_colorspace,
@@ -228,6 +230,7 @@ static const AVFilter *filter_list[] = {
     &ff_vf_interlace,
     &ff_vf_interleave,
     &ff_vf_kerndeint,
+    &ff_vf_lagfun,
     &ff_vf_lenscorrection,
     &ff_vf_limiter,
     &ff_vf_loop,
@@ -350,6 +353,7 @@ static const AVFilter *filter_list[] = {
     &ff_vf_waveform,
     &ff_vf_weave,
     &ff_vf_xbr,
+    &ff_vf_xmedian,
     &ff_vf_xstack,
     &ff_vf_yadif,
     &ff_vf_zoompan,

SMP/libavutil.def

@@ -488,6 +488,8 @@ EXPORTS
     av_twofish_alloc
     av_twofish_crypt
     av_twofish_init
+    av_tx_init
+    av_tx_uninit
     av_usleep
     av_utf8_decode
     av_vbprintf

SMP/libavutil.vcxproj

@@ -134,6 +134,7 @@
     <ClCompile Include="..\libavutil\xga_font_data.c" />
     <ClCompile Include="..\libavutil\xtea.c" />
     <ClCompile Include="..\libavutil\tea.c" />
+    <ClCompile Include="..\libavutil\tx.c" />
     <ClCompile Include="..\libavutil\hwcontext_cuda.c" />
     <ClCompile Include="..\libavutil\hwcontext_dxva2.c" />
     <ClCompile Include="..\libavutil\lzo.c" />
@@ -246,6 +247,7 @@
     <ClInclude Include="..\libavutil\version.h" />
     <ClInclude Include="..\libavutil\xtea.h" />
     <ClInclude Include="..\libavutil\tea.h" />
+    <ClInclude Include="..\libavutil\tx.h" />
     <ClInclude Include="..\libavutil\lzo.h" />
     <ClInclude Include="libavutil\avconfig.h" />
     <ClInclude Include="libavutil\ffversion.h" />
@@ -549,6 +551,7 @@ copy ..\libavutil\twofish.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\version.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\xtea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tea.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\tx.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\lzo.h "$(OutDir)"\include\libavutil
 copy libavutil\avconfig.h "$(OutDir)"\include\libavutil
 copy libavutil\ffversion.h "$(OutDir)"\include\libavutil
@@ -694,6 +697,7 @@ copy ..\libavutil\twofish.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\version.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\xtea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tea.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\tx.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\lzo.h "$(OutDir)"\include\libavutil
 copy libavutil\avconfig.h "$(OutDir)"\include\libavutil
 copy libavutil\ffversion.h "$(OutDir)"\include\libavutil
@@ -846,6 +850,7 @@ copy ..\libavutil\twofish.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\version.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\xtea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tea.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\tx.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\lzo.h "$(OutDir)"\include\libavutil
 copy libavutil\avconfig.h "$(OutDir)"\include\libavutil
 copy libavutil\ffversion.h "$(OutDir)"\include\libavutil
@@ -996,6 +1001,7 @@ copy ..\libavutil\twofish.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\version.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\xtea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tea.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\tx.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\lzo.h "$(OutDir)"\include\libavutil
 copy libavutil\avconfig.h "$(OutDir)"\include\libavutil
 copy libavutil\ffversion.h "$(OutDir)"\include\libavutil
@@ -1147,6 +1153,7 @@ copy ..\libavutil\twofish.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\version.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\xtea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tea.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\tx.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\lzo.h "$(OutDir)"\include\libavutil
 copy libavutil\avconfig.h "$(OutDir)"\include\libavutil
 copy libavutil\ffversion.h "$(OutDir)"\include\libavutil
@@ -1296,6 +1303,7 @@ copy ..\libavutil\twofish.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\version.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\xtea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tea.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\tx.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\lzo.h "$(OutDir)"\include\libavutil
 copy libavutil\avconfig.h "$(OutDir)"\include\libavutil
 copy libavutil\ffversion.h "$(OutDir)"\include\libavutil
@@ -1453,6 +1461,7 @@ copy ..\libavutil\twofish.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\version.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\xtea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tea.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\tx.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\lzo.h "$(OutDir)"\include\libavutil
 copy libavutil\avconfig.h "$(OutDir)"\include\libavutil
 copy libavutil\ffversion.h "$(OutDir)"\include\libavutil
@@ -1609,6 +1618,7 @@ copy ..\libavutil\twofish.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\version.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\xtea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tea.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\tx.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\lzo.h "$(OutDir)"\include\libavutil
 copy libavutil\avconfig.h "$(OutDir)"\include\libavutil
 copy libavutil\ffversion.h "$(OutDir)"\include\libavutil
@@ -1766,6 +1776,7 @@ copy ..\libavutil\twofish.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\version.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\xtea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tea.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\tx.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\lzo.h "$(OutDir)"\include\libavutil
 copy libavutil\avconfig.h "$(OutDir)"\include\libavutil
 copy libavutil\ffversion.h "$(OutDir)"\include\libavutil
@@ -1922,6 +1933,7 @@ copy ..\libavutil\twofish.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\version.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\xtea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tea.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\tx.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\lzo.h "$(OutDir)"\include\libavutil
 copy libavutil\avconfig.h "$(OutDir)"\include\libavutil
 copy libavutil\ffversion.h "$(OutDir)"\include\libavutil

SMP/libavutil.vcxproj.filters

@@ -255,6 +255,9 @@
     <ClCompile Include="..\libavutil\tea.c">
       <Filter>Source Files\libavutil</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavutil\tx.c">
+      <Filter>Source Files\libavutil</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavutil\hwcontext_cuda.c">
       <Filter>Source Files\libavutil</Filter>
     </ClCompile>
@@ -551,6 +554,9 @@
     <ClInclude Include="..\libavutil\tea.h">
       <Filter>Header Files\libavutil</Filter>
     </ClInclude>
+    <ClInclude Include="..\libavutil\tx.h">
+      <Filter>Header Files\libavutil</Filter>
+    </ClInclude>
     <ClInclude Include="..\libavutil\lzo.h">
       <Filter>Header Files\libavutil</Filter>
     </ClInclude>