project: Update for recent upstream merge.

ShiftMediaProject · Dec 9, 2018 · a36cc94 · a36cc94
1 parent 0b906e9
commit a36cc94
Show file tree

Hide file tree

Showing 23 changed files with 443 additions and 225 deletions.
diff --git a/SMP/config.asm b/SMP/config.asm
@@ -680,6 +680,7 @@
 %define CONFIG_RTPDEC 1
 %define CONFIG_RTPENC_CHAIN 1
 %define CONFIG_RV34DSP 1
+%define CONFIG_SCENE_SAD 1
 %define CONFIG_SINEWIN 1
 %define CONFIG_SNAPPY 1
 %define CONFIG_SRTP 1
@@ -719,9 +720,11 @@
 %define CONFIG_MOV2TEXTSUB_BSF 1
 %define CONFIG_NOISE_BSF 1
 %define CONFIG_NULL_BSF 1
+%define CONFIG_PRORES_METADATA_BSF 1
 %define CONFIG_REMOVE_EXTRADATA_BSF 1
 %define CONFIG_TEXT2MOVSUB_BSF 1
 %define CONFIG_TRACE_HEADERS_BSF 1
+%define CONFIG_TRUEHD_CORE_BSF 1
 %define CONFIG_VP9_METADATA_BSF 1
 %define CONFIG_VP9_RAW_REORDER_BSF 1
 %define CONFIG_VP9_SUPERFRAME_BSF 1
@@ -1340,6 +1343,7 @@
 %define CONFIG_WMAV1_ENCODER 1
 %define CONFIG_WMAV2_ENCODER 1
 %define CONFIG_PCM_ALAW_ENCODER 1
+%define CONFIG_PCM_DVD_ENCODER 1
 %define CONFIG_PCM_F32BE_ENCODER 1
 %define CONFIG_PCM_F32LE_ENCODER 1
 %define CONFIG_PCM_F64BE_ENCODER 1
@@ -1710,6 +1714,7 @@
 %define CONFIG_BWDIF_FILTER 1
 %define CONFIG_CHROMAHOLD_FILTER 1
 %define CONFIG_CHROMAKEY_FILTER 1
+%define CONFIG_CHROMASHIFT_FILTER 1
 %define CONFIG_CIESCOPE_FILTER 1
 %define CONFIG_CODECVIEW_FILTER 1
 %define CONFIG_COLORBALANCE_FILTER 1
@@ -1734,6 +1739,7 @@
 %define CONFIG_DEBLOCK_FILTER 1
 %define CONFIG_DECIMATE_FILTER 1
 %define CONFIG_DECONVOLVE_FILTER 1
+%define CONFIG_DEDOT_FILTER 1
 %define CONFIG_DEFLATE_FILTER 1
 %define CONFIG_DEFLICKER_FILTER 1
 %define CONFIG_DEINTERLACE_QSV_FILTER 1
@@ -1774,6 +1780,7 @@
 %define CONFIG_FRAMEPACK_FILTER 1
 %define CONFIG_FRAMERATE_FILTER 1
 %define CONFIG_FRAMESTEP_FILTER 1
+%define CONFIG_FREEZEDETECT_FILTER 1
 %define CONFIG_FREI0R_FILTER 0
 %define CONFIG_FSPP_FILTER 1
 %define CONFIG_GBLUR_FILTER 1
@@ -1864,6 +1871,7 @@
 %define CONFIG_REMOVELOGO_FILTER 1
 %define CONFIG_REPEATFIELDS_FILTER 1
 %define CONFIG_REVERSE_FILTER 1
+%define CONFIG_RGBASHIFT_FILTER 1
 %define CONFIG_ROBERTS_FILTER 1
 %define CONFIG_ROBERTS_OPENCL_FILTER 0
 %define CONFIG_ROTATE_FILTER 1
@@ -1920,6 +1928,7 @@
 %define CONFIG_TPAD_FILTER 1
 %define CONFIG_TRANSPOSE_FILTER 1
 %define CONFIG_TRANSPOSE_NPP_FILTER 0
+%define CONFIG_TRANSPOSE_OPENCL_FILTER 0
 %define CONFIG_TRIM_FILTER 1
 %define CONFIG_UNPREMULTIPLY_FILTER 1
 %define CONFIG_UNSHARP_FILTER 1
@@ -2042,6 +2051,7 @@
 %define CONFIG_DAUD_DEMUXER 1
 %define CONFIG_DCSTR_DEMUXER 1
 %define CONFIG_DFA_DEMUXER 1
+%define CONFIG_DHAV_DEMUXER 1
 %define CONFIG_DIRAC_DEMUXER 1
 %define CONFIG_DNXHD_DEMUXER 1
 %define CONFIG_DSF_DEMUXER 1

diff --git a/SMP/config.h b/SMP/config.h
@@ -745,6 +745,7 @@
 #define CONFIG_RTPDEC 1
 #define CONFIG_RTPENC_CHAIN 1
 #define CONFIG_RV34DSP 1
+#define CONFIG_SCENE_SAD 1
 #define CONFIG_SINEWIN 1
 #define CONFIG_SNAPPY 1
 #define CONFIG_SRTP 1
@@ -784,9 +785,11 @@
 #define CONFIG_MOV2TEXTSUB_BSF 1
 #define CONFIG_NOISE_BSF 1
 #define CONFIG_NULL_BSF 1
+#define CONFIG_PRORES_METADATA_BSF 1
 #define CONFIG_REMOVE_EXTRADATA_BSF 1
 #define CONFIG_TEXT2MOVSUB_BSF 1
 #define CONFIG_TRACE_HEADERS_BSF 1
+#define CONFIG_TRUEHD_CORE_BSF 1
 #define CONFIG_VP9_METADATA_BSF 1
 #define CONFIG_VP9_RAW_REORDER_BSF 1
 #define CONFIG_VP9_SUPERFRAME_BSF 1
@@ -1405,6 +1408,7 @@
 #define CONFIG_WMAV1_ENCODER 1
 #define CONFIG_WMAV2_ENCODER 1
 #define CONFIG_PCM_ALAW_ENCODER 1
+#define CONFIG_PCM_DVD_ENCODER 1
 #define CONFIG_PCM_F32BE_ENCODER 1
 #define CONFIG_PCM_F32LE_ENCODER 1
 #define CONFIG_PCM_F64BE_ENCODER 1
@@ -1796,6 +1800,7 @@
 #define CONFIG_BWDIF_FILTER 1
 #define CONFIG_CHROMAHOLD_FILTER 1
 #define CONFIG_CHROMAKEY_FILTER 1
+#define CONFIG_CHROMASHIFT_FILTER 1
 #define CONFIG_CIESCOPE_FILTER 1
 #define CONFIG_CODECVIEW_FILTER 1
 #define CONFIG_COLORBALANCE_FILTER 1
@@ -1820,6 +1825,7 @@
 #define CONFIG_DEBLOCK_FILTER 1
 #define CONFIG_DECIMATE_FILTER 1
 #define CONFIG_DECONVOLVE_FILTER 1
+#define CONFIG_DEDOT_FILTER 1
 #define CONFIG_DEFLATE_FILTER 1
 #define CONFIG_DEFLICKER_FILTER 1
 #define CONFIG_DEINTERLACE_QSV_FILTER 1
@@ -1860,6 +1866,7 @@
 #define CONFIG_FRAMEPACK_FILTER 1
 #define CONFIG_FRAMERATE_FILTER 1
 #define CONFIG_FRAMESTEP_FILTER 1
+#define CONFIG_FREEZEDETECT_FILTER 1
 #define CONFIG_FREI0R_FILTER 0
 #define CONFIG_FSPP_FILTER 1
 #define CONFIG_GBLUR_FILTER 1
@@ -1950,6 +1957,7 @@
 #define CONFIG_REMOVELOGO_FILTER 1
 #define CONFIG_REPEATFIELDS_FILTER 1
 #define CONFIG_REVERSE_FILTER 1
+#define CONFIG_RGBASHIFT_FILTER 1
 #define CONFIG_ROBERTS_FILTER 1
 #define CONFIG_ROBERTS_OPENCL_FILTER 0
 #define CONFIG_ROTATE_FILTER 1
@@ -2006,6 +2014,7 @@
 #define CONFIG_TPAD_FILTER 1
 #define CONFIG_TRANSPOSE_FILTER 1
 #define CONFIG_TRANSPOSE_NPP_FILTER 0
+#define CONFIG_TRANSPOSE_OPENCL_FILTER 0
 #define CONFIG_TRIM_FILTER 1
 #define CONFIG_UNPREMULTIPLY_FILTER 1
 #define CONFIG_UNSHARP_FILTER 1
@@ -2128,6 +2137,7 @@
 #define CONFIG_DAUD_DEMUXER 1
 #define CONFIG_DCSTR_DEMUXER 1
 #define CONFIG_DFA_DEMUXER 1
+#define CONFIG_DHAV_DEMUXER 1
 #define CONFIG_DIRAC_DEMUXER 1
 #define CONFIG_DNXHD_DEMUXER 1
 #define CONFIG_DSF_DEMUXER 1

diff --git a/SMP/ffmpeg.vcxproj b/SMP/ffmpeg.vcxproj
@@ -145,41 +145,49 @@
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffmpeg\</IntDir>
     <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffmpeg\</IntDir>
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
     <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffmpeg\</IntDir>
     <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'">
     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffmpeg\</IntDir>
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
     <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffmpeg\</IntDir>
     <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffmpeg\</IntDir>
     <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffmpeg\</IntDir>
     <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'">
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffmpeg\</IntDir>
     <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

diff --git a/SMP/ffplay.vcxproj b/SMP/ffplay.vcxproj
@@ -140,41 +140,49 @@
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffplay\</IntDir>
     <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffplay\</IntDir>
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
     <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffplay\</IntDir>
     <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'">
     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffplay\</IntDir>
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
     <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffplay\</IntDir>
     <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffplay\</IntDir>
     <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffplay\</IntDir>
     <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'">
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffplay\</IntDir>
     <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

diff --git a/SMP/ffprobe.vcxproj b/SMP/ffprobe.vcxproj
@@ -140,41 +140,49 @@
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffprobe\</IntDir>
     <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffprobe\</IntDir>
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
     <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffprobe\</IntDir>
     <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'">
     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffprobe\</IntDir>
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
     <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffprobe\</IntDir>
     <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffprobe\</IntDir>
     <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffprobe\</IntDir>
     <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'">
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffprobe\</IntDir>
     <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>