project: Update for recent upstream merge.

ShiftMediaProject · May 15, 2022 · 852871f · 852871f
1 parent 89f47e2
commit 852871f
Show file tree

Hide file tree

Showing 51 changed files with 1,186 additions and 468 deletions.
diff --git a/SMP/config.asm b/SMP/config.asm
@@ -490,6 +490,7 @@
 %define CONFIG_GNUTLS 1
 %define CONFIG_JNI 0
 %define CONFIG_LADSPA 0
+%define CONFIG_LCMS2 0
 %define CONFIG_LIBAOM 0
 %define CONFIG_LIBASS 1
 %define CONFIG_LIBBLURAY 1
@@ -510,6 +511,7 @@
 %define CONFIG_LIBIEC61883 0
 %define CONFIG_LIBILBC 1
 %define CONFIG_LIBJACK 0
+%define CONFIG_LIBJXL 0
 %define CONFIG_LIBKLVANC 0
 %define CONFIG_LIBKVAZAAR 0
 %define CONFIG_LIBMODPLUG 1

diff --git a/SMP/config.h b/SMP/config.h
@@ -581,6 +581,7 @@
 #define CONFIG_GNUTLS 1
 #define CONFIG_JNI 0
 #define CONFIG_LADSPA 0
+#define CONFIG_LCMS2 0
 #define CONFIG_LIBAOM 0
 #define CONFIG_LIBASS 1
 #define CONFIG_LIBBLURAY 1
@@ -601,6 +602,7 @@
 #define CONFIG_LIBIEC61883 0
 #define CONFIG_LIBILBC 1
 #define CONFIG_LIBJACK 0
+#define CONFIG_LIBJXL 0
 #define CONFIG_LIBKLVANC 0
 #define CONFIG_LIBKVAZAAR 0
 #define CONFIG_LIBMODPLUG 1

diff --git a/SMP/config_components.h b/SMP/config_components.h
@@ -49,6 +49,7 @@
 #define CONFIG_NULL_BSF 1
 #define CONFIG_OPUS_METADATA_BSF 1
 #define CONFIG_PCM_RECHUNK_BSF 1
+#define CONFIG_PGS_FRAME_MERGE_BSF 1
 #define CONFIG_PRORES_METADATA_BSF 1
 #define CONFIG_REMOVE_EXTRADATA_BSF 1
 #define CONFIG_SETTS_BSF 1
@@ -597,6 +598,7 @@
 #define CONFIG_LIBGSM_DECODER 0
 #define CONFIG_LIBGSM_MS_DECODER 0
 #define CONFIG_LIBILBC_DECODER 1
+#define CONFIG_LIBJXL_DECODER 0
 #define CONFIG_LIBOPENCORE_AMRNB_DECODER 0
 #define CONFIG_LIBOPENCORE_AMRWB_DECODER 0
 #define CONFIG_LIBOPENJPEG_DECODER 0
@@ -871,6 +873,7 @@
 #define CONFIG_LIBGSM_ENCODER 0
 #define CONFIG_LIBGSM_MS_ENCODER 0
 #define CONFIG_LIBILBC_ENCODER 1
+#define CONFIG_LIBJXL_ENCODER 0
 #define CONFIG_LIBMP3LAME_ENCODER 1
 #define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0
 #define CONFIG_LIBOPENJPEG_ENCODER 0
@@ -1398,6 +1401,7 @@
 #define CONFIG_BLACKFRAME_FILTER 1
 #define CONFIG_BLEND_FILTER 1
 #define CONFIG_BLEND_VULKAN_FILTER 0
+#define CONFIG_BLURDETECT_FILTER 1
 #define CONFIG_BM3D_FILTER 1
 #define CONFIG_BOXBLUR_FILTER 1
 #define CONFIG_BOXBLUR_OPENCL_FILTER 0
@@ -1419,6 +1423,7 @@
 #define CONFIG_COLORKEY_OPENCL_FILTER 0
 #define CONFIG_COLORHOLD_FILTER 1
 #define CONFIG_COLORLEVELS_FILTER 1
+#define CONFIG_COLORMAP_FILTER 1
 #define CONFIG_COLORMATRIX_FILTER 1
 #define CONFIG_COLORSPACE_FILTER 1
 #define CONFIG_COLORTEMPERATURE_FILTER 1
@@ -1527,6 +1532,8 @@
 #   define CONFIG_HWUPLOAD_CUDA_FILTER 0
 #endif
 #define CONFIG_HYSTERESIS_FILTER 1
+#define CONFIG_ICCDETECT_FILTER 0
+#define CONFIG_ICCGEN_FILTER 0
 #define CONFIG_IDENTITY_FILTER 1
 #define CONFIG_IDET_FILTER 1
 #define CONFIG_IL_FILTER 1
@@ -1569,6 +1576,7 @@
 #define CONFIG_MORPHO_FILTER 1
 #define CONFIG_MPDECIMATE_FILTER 1
 #define CONFIG_MSAD_FILTER 1
+#define CONFIG_MULTIPLY_FILTER 1
 #define CONFIG_NEGATE_FILTER 1
 #define CONFIG_NLMEANS_FILTER 1
 #define CONFIG_NLMEANS_OPENCL_FILTER 0
@@ -1745,6 +1753,7 @@
 #define CONFIG_ALLYUV_FILTER 1
 #define CONFIG_CELLAUTO_FILTER 1
 #define CONFIG_COLOR_FILTER 1
+#define CONFIG_COLORCHART_FILTER 1
 #define CONFIG_COLORSPECTRUM_FILTER 1
 #define CONFIG_COREIMAGESRC_FILTER 0
 #define CONFIG_FREI0R_SRC_FILTER 0
@@ -2098,6 +2107,7 @@
 #define CONFIG_IMAGE_J2K_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_JPEGXL_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_PAM_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_PBM_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_PCX_PIPE_DEMUXER 1
@@ -2143,6 +2153,7 @@
 #define CONFIG_ASF_STREAM_MUXER 1
 #define CONFIG_AU_MUXER 1
 #define CONFIG_AVI_MUXER 1
+#define CONFIG_AVIF_MUXER 1
 #define CONFIG_AVM2_MUXER 1
 #define CONFIG_AVS2_MUXER 1
 #define CONFIG_AVS3_MUXER 1

diff --git a/SMP/ffmpeg.vcxproj b/SMP/ffmpeg.vcxproj
@@ -223,8 +223,8 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_LIB;_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)\..\compat\atomics\win32\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_LIB;_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <C99Support>true</C99Support>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <OmitFramePointers>false</OmitFramePointers>
@@ -265,6 +265,9 @@ del ..\version.h
 if exist ..\config.asm (
 del ..\config.asm
 )
+if exist ..\config_components.h (
+del ..\config_components.h
+)
 if exist ..\libavutil\avconfig.h (
 del ..\libavutil\avconfig.h
 )
@@ -276,8 +279,8 @@ del ..\libavutil\ffversion.h
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_LIB;_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)\..\compat\atomics\win32\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_LIB;_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <C99Support>true</C99Support>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <AdditionalOptions Condition="$([System.String]::Copy($(PlatformToolset)).Contains('Intel'))">/Qvec- /Qsimd- %(AdditionalOptions)</AdditionalOptions>
@@ -316,6 +319,9 @@ del ..\version.h
 if exist ..\config.asm (
 del ..\config.asm
 )
+if exist ..\config_components.h (
+del ..\config_components.h
+)
 if exist ..\libavutil\avconfig.h (
 del ..\libavutil\avconfig.h
 )
@@ -327,8 +333,8 @@ del ..\libavutil\ffversion.h
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)\..\compat\atomics\win32\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <C99Support>true</C99Support>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <OmitFramePointers>false</OmitFramePointers>
@@ -369,6 +375,9 @@ del ..\version.h
 if exist ..\config.asm (
 del ..\config.asm
 )
+if exist ..\config_components.h (
+del ..\config_components.h
+)
 if exist ..\libavutil\avconfig.h (
 del ..\libavutil\avconfig.h
 )
@@ -380,8 +389,8 @@ del ..\libavutil\ffversion.h
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)\..\compat\atomics\win32\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <C99Support>true</C99Support>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <AdditionalOptions Condition="$([System.String]::Copy($(PlatformToolset)).Contains('Intel'))">/Qvec- /Qsimd- %(AdditionalOptions)</AdditionalOptions>
@@ -420,6 +429,9 @@ del ..\version.h
 if exist ..\config.asm (
 del ..\config.asm
 )
+if exist ..\config_components.h (
+del ..\config_components.h
+)
 if exist ..\libavutil\avconfig.h (
 del ..\libavutil\avconfig.h
 )
@@ -434,8 +446,8 @@ del ..\libavutil\ffversion.h
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <OmitFramePointers>true</OmitFramePointers>
       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_LIB;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)\..\compat\atomics\win32\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_LIB;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <StringPooling>true</StringPooling>
       <C99Support>true</C99Support>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -477,6 +489,9 @@ del ..\version.h
 if exist ..\config.asm (
 del ..\config.asm
 )
+if exist ..\config_components.h (
+del ..\config_components.h
+)
 if exist ..\libavutil\avconfig.h (
 del ..\libavutil\avconfig.h
 )
@@ -491,8 +506,8 @@ del ..\libavutil\ffversion.h
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <OmitFramePointers>true</OmitFramePointers>
       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_LIB;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)\..\compat\atomics\win32\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_LIB;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <StringPooling>true</StringPooling>
       <C99Support>true</C99Support>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -533,6 +548,9 @@ del ..\version.h
 if exist ..\config.asm (
 del ..\config.asm
 )
+if exist ..\config_components.h (
+del ..\config_components.h
+)
 if exist ..\libavutil\avconfig.h (
 del ..\libavutil\avconfig.h
 )
@@ -546,8 +564,8 @@ del ..\libavutil\ffversion.h
       <WarningLevel>Level3</WarningLevel>
       <OmitFramePointers>true</OmitFramePointers>
       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)\..\compat\atomics\win32\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <StringPooling>true</StringPooling>
       <C99Support>true</C99Support>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -590,6 +608,9 @@ del ..\version.h
 if exist ..\config.asm (
 del ..\config.asm
 )
+if exist ..\config_components.h (
+del ..\config_components.h
+)
 if exist ..\libavutil\avconfig.h (
 del ..\libavutil\avconfig.h
 )
@@ -603,8 +624,8 @@ del ..\libavutil\ffversion.h
       <WarningLevel>Level3</WarningLevel>
       <OmitFramePointers>true</OmitFramePointers>
       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)\..\compat\atomics\win32\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <StringPooling>true</StringPooling>
       <C99Support>true</C99Support>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -646,6 +667,9 @@ del ..\version.h
 if exist ..\config.asm (
 del ..\config.asm
 )
+if exist ..\config_components.h (
+del ..\config_components.h
+)
 if exist ..\libavutil\avconfig.h (
 del ..\libavutil\avconfig.h
 )