projects: Update for recent upstream merge.

d2093fff · Matt Oliver · 25903170 · d2093fff · d2093fff · d2093fff
6 changed file
--- a/SMP/config.asm
+++ b/SMP/config.asm
@@ -247,6 +247,7 @@
 %define HAVE_MACHINE_IOCTL_BT848_H 0
 %define HAVE_MACHINE_IOCTL_METEOR_H 0
 %define HAVE_MALLOC_H 1
+%define HAVE_OPENCV2_CORE_CORE_C_H 0
 %define HAVE_OPENJPEG_2_1_OPENJPEG_H 0
 %define HAVE_OPENJPEG_2_0_OPENJPEG_H 0
 %define HAVE_OPENJPEG_1_5_OPENJPEG_H 0
@@ -366,9 +367,9 @@
 %define HAVE_GNU_AS 0
 %define HAVE_GNU_WINDRES 0
 %define HAVE_IBM_ASM 0
+%define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 0
 %define HAVE_INLINE_ASM_LABELS 1
 %define HAVE_INLINE_ASM_NONLOCAL_LABELS 0
-%define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 0
 %define HAVE_PRAGMA_DEPRECATED 1
 %define HAVE_RSYNC_CONTIMEOUT 1
 %define HAVE_SYMVER_ASM_LABEL 0
@@ -392,9 +393,8 @@
 %define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 0
 %define HAVE_ATOMICS_NATIVE 1
 %define HAVE_DOS_PATHS 1
-%define HAVE_DXVA2API_COBJ 1
 %define HAVE_DXVA2_LIB 1
-%define HAVE_WINRT 0
+%define HAVE_DXVA2API_COBJ 1
 %define HAVE_LIBC_MSVCRT 1
 %define HAVE_LIBDC1394_1 0
 %define HAVE_LIBDC1394_2 0
@@ -408,6 +408,7 @@
 %define HAVE_THREADS 1
 %define HAVE_VAAPI_X11 0
 %define HAVE_VDPAU_X11 0
+%define HAVE_WINRT 0
 %define HAVE_XLIB 0
 %define CONFIG_BSFS 1
 %define CONFIG_DECODERS 1
@@ -483,7 +484,6 @@
 %define CONFIG_LIBOPENJPEG 0
 %define CONFIG_LIBOPUS 1
 %define CONFIG_LIBPULSE 0
-%define CONFIG_LIBQUVI 0
 %define CONFIG_LIBRTMP 0
 %define CONFIG_LIBRUBBERBAND 0
 %define CONFIG_LIBSCHROEDINGER 0
@@ -619,8 +619,8 @@
 %define CONFIG_INTRAX8 1
 %define CONFIG_IVIDSP 1
 %define CONFIG_JPEGTABLES 1
-%define CONFIG_LIBX262 0
 %define CONFIG_LGPLV3 0
+%define CONFIG_LIBX262 0
 %define CONFIG_LLAUDDSP 1
 %define CONFIG_LLVIDDSP 1
 %define CONFIG_LPC 1
@@ -708,6 +708,7 @@
 %define CONFIG_DNXHD_DECODER 1
 %define CONFIG_DPX_DECODER 1
 %define CONFIG_DSICINVIDEO_DECODER 1
+%define CONFIG_DVAUDIO_DECODER 1
 %define CONFIG_DVVIDEO_DECODER 1
 %define CONFIG_DXA_DECODER 1
 %define CONFIG_DXTORY_DECODER 1
@@ -1353,7 +1354,6 @@
 %define CONFIG_LIBGME_DEMUXER 1
 %define CONFIG_LIBMODPLUG_DEMUXER 1
 %define CONFIG_LIBNUT_DEMUXER 0
-%define CONFIG_LIBQUVI_DEMUXER 0
 %define CONFIG_A64MULTI_ENCODER 1
 %define CONFIG_A64MULTI5_ENCODER 1
 %define CONFIG_ALIAS_PIX_ENCODER 1

--- a/SMP/config.h
+++ b/SMP/config.h
@@ -277,6 +277,7 @@
 #define HAVE_MACHINE_IOCTL_BT848_H 0
 #define HAVE_MACHINE_IOCTL_METEOR_H 0
 #define HAVE_MALLOC_H 1
+#define HAVE_OPENCV2_CORE_CORE_C_H 0
 #define HAVE_OPENJPEG_2_1_OPENJPEG_H 0
 #define HAVE_OPENJPEG_2_0_OPENJPEG_H 0
 #define HAVE_OPENJPEG_1_5_OPENJPEG_H 0
@@ -404,9 +405,9 @@
 #define HAVE_GNU_AS 0
 #define HAVE_GNU_WINDRES 0
 #define HAVE_IBM_ASM 0
+#define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 0
 #define HAVE_INLINE_ASM_LABELS 1
 #define HAVE_INLINE_ASM_NONLOCAL_LABELS 0
-#define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 0
 #define HAVE_PRAGMA_DEPRECATED 1
 #define HAVE_RSYNC_CONTIMEOUT 1
 #define HAVE_SYMVER_ASM_LABEL 0
@@ -434,9 +435,8 @@
 #define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 0
 #define HAVE_ATOMICS_NATIVE 1
 #define HAVE_DOS_PATHS 1
-#define HAVE_DXVA2API_COBJ 1
 #define HAVE_DXVA2_LIB 1
-#define HAVE_WINRT 0
+#define HAVE_DXVA2API_COBJ 1
 #define HAVE_LIBC_MSVCRT 1
 #define HAVE_LIBDC1394_1 0
 #define HAVE_LIBDC1394_2 0
@@ -450,6 +450,7 @@
 #define HAVE_THREADS 1
 #define HAVE_VAAPI_X11 0
 #define HAVE_VDPAU_X11 0
+#define HAVE_WINRT 0
 #define HAVE_XLIB 0
 #define CONFIG_BSFS 1
 #define CONFIG_DECODERS 1
@@ -525,7 +526,6 @@
 #define CONFIG_LIBOPENJPEG 0
 #define CONFIG_LIBOPUS 1
 #define CONFIG_LIBPULSE 0
-#define CONFIG_LIBQUVI 0
 #define CONFIG_LIBRTMP 0
 #define CONFIG_LIBRUBBERBAND 0
 #define CONFIG_LIBSCHROEDINGER 0
@@ -669,8 +669,8 @@
 #define CONFIG_INTRAX8 1
 #define CONFIG_IVIDSP 1
 #define CONFIG_JPEGTABLES 1
-#define CONFIG_LIBX262 0
 #define CONFIG_LGPLV3 0
+#define CONFIG_LIBX262 0
 #define CONFIG_LLAUDDSP 1
 #define CONFIG_LLVIDDSP 1
 #define CONFIG_LPC 1
@@ -758,6 +758,7 @@
 #define CONFIG_DNXHD_DECODER 1
 #define CONFIG_DPX_DECODER 1
 #define CONFIG_DSICINVIDEO_DECODER 1
+#define CONFIG_DVAUDIO_DECODER 1
 #define CONFIG_DVVIDEO_DECODER 1
 #define CONFIG_DXA_DECODER 1
 #define CONFIG_DXTORY_DECODER 1
@@ -1403,7 +1404,6 @@
 #define CONFIG_LIBGME_DEMUXER 1
 #define CONFIG_LIBMODPLUG_DEMUXER 1
 #define CONFIG_LIBNUT_DEMUXER 0
-#define CONFIG_LIBQUVI_DEMUXER 0
 #define CONFIG_A64MULTI_ENCODER 1
 #define CONFIG_A64MULTI5_ENCODER 1
 #define CONFIG_ALIAS_PIX_ENCODER 1

--- a/SMP/ffmpeg.sln
+++ b/SMP/ffmpeg.sln
@@ -18,8 +18,8 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libavfilter", "libavfilter.vcxproj", "{BC2E1028-66CD-41A0-AF90-EEBD8CC52787}"
 	ProjectSection(ProjectDependencies) = postProject
 		{CE6C44DD-6E38-4293-8AB3-04EE28CCA972} = {CE6C44DD-6E38-4293-8AB3-04EE28CCA972}
-		{30A96E9B-8061-4F19-BD71-FDE7EA8F7929} = {30A96E9B-8061-4F19-BD71-FDE7EA8F7929}
 		{B4824EFF-C340-425D-A4A8-E2E02A71A7AE} = {B4824EFF-C340-425D-A4A8-E2E02A71A7AE}
+		{30A96E9B-8061-4F19-BD71-FDE7EA8F7929} = {30A96E9B-8061-4F19-BD71-FDE7EA8F7929}
 		{3CE4A9EF-98B6-4454-B76E-3AD9C03A2114} = {3CE4A9EF-98B6-4454-B76E-3AD9C03A2114}
 		{4D9C457D-9ADA-4A12-9D06-42D80124C5AB} = {4D9C457D-9ADA-4A12-9D06-42D80124C5AB}
 		{6D8A6330-8EBE-49FD-9281-0A396F9F28F2} = {6D8A6330-8EBE-49FD-9281-0A396F9F28F2}

--- a/SMP/libavcodec.vcxproj
+++ b/SMP/libavcodec.vcxproj
@@ -114,6 +114,7 @@
    <YASM Include="..\libavcodec\x86\alacdsp.asm" />
    <YASM Include="..\libavcodec\x86\pngdsp.asm" />
    <YASM Include="..\libavcodec\x86\dcadsp.asm" />
+    <YASM Include="..\libavcodec\x86\synth_filter.asm" />
    <YASM Include="..\libavcodec\x86\diracdsp_yasm.asm" />
    <YASM Include="..\libavcodec\x86\dwt_yasm.asm" />
    <YASM Include="..\libavcodec\x86\dnxhdenc.asm" />
@@ -439,7 +440,9 @@
    <ClCompile Include="..\libavcodec\dcadata.c" />
    <ClCompile Include="..\libavcodec\dca_exss.c" />
    <ClCompile Include="..\libavcodec\dca_xll.c" />
-    <ClCompile Include="..\libavcodec\synth_filter.c" />
+    <ClCompile Include="..\libavcodec\synth_filter.c">
+      <ObjectFileName>$(IntDir)\libavcodec_synth_filter.obj</ObjectFileName>
+    </ClCompile>
    <ClCompile Include="..\libavcodec\dcaenc.c" />
    <ClCompile Include="..\libavcodec\dds.c" />
    <ClCompile Include="..\libavcodec\diracdec.c" />
@@ -462,6 +465,7 @@
    <ClCompile Include="..\libavcodec\dvbsub.c" />
    <ClCompile Include="..\libavcodec\dvdsubdec.c" />
    <ClCompile Include="..\libavcodec\dvdsubenc.c" />
+    <ClCompile Include="..\libavcodec\dvaudiodec.c" />
    <ClCompile Include="..\libavcodec\dvdec.c" />
    <ClCompile Include="..\libavcodec\dv.c" />
    <ClCompile Include="..\libavcodec\dvdata.c" />
@@ -1006,6 +1010,7 @@
      <ObjectFileName>$(IntDir)\libavcodec_x86_cavsdsp.obj</ObjectFileName>
    </ClCompile>
    <ClCompile Include="..\libavcodec\x86\dcadsp_init.c" />
+    <ClCompile Include="..\libavcodec\x86\synth_filter_init.c" />
    <ClCompile Include="..\libavcodec\x86\dnxhdenc_init.c" />
    <ClCompile Include="..\libavcodec\x86\hevcdsp_init.c" />
    <ClCompile Include="..\libavcodec\x86\jpeg2000dsp_init.c" />

--- a/SMP/libavcodec.vcxproj.filters
+++ b/SMP/libavcodec.vcxproj.filters
@@ -166,6 +166,9 @@
    <YASM Include="..\libavcodec\x86\dcadsp.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
    </YASM>
+    <YASM Include="..\libavcodec\x86\synth_filter.asm">
+      <Filter>Source Files\libavcodec\x86</Filter>
+    </YASM>
    <YASM Include="..\libavcodec\x86\diracdsp_yasm.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
    </YASM>
@@ -1056,6 +1059,9 @@
    <ClCompile Include="..\libavcodec\dvdsubenc.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavcodec\dvaudiodec.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavcodec\dvdec.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
@@ -2580,6 +2586,9 @@
    <ClCompile Include="..\libavcodec\x86\dcadsp_init.c">
      <Filter>Source Files\libavcodec\x86</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavcodec\x86\synth_filter_init.c">
+      <Filter>Source Files\libavcodec\x86</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavcodec\x86\dnxhdenc_init.c">
      <Filter>Source Files\libavcodec\x86</Filter>
    </ClCompile>

--- a/SMP/libavfilter.vcxproj
+++ b/SMP/libavfilter.vcxproj
@@ -789,7 +789,7 @@ cd $(ProjectDir)
      <ProgramDatabaseFile>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDatabaseFile>
      <ModuleDefinitionFile>.\libavfilter.def</ModuleDefinitionFile>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>avutild.lib;avformatd.lib;avcodecd.lib;swresampled.lib;postprocd.lib;swscaled.lib;assd.lib;fontconfigd.lib;freetyped.lib;fribidid.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avutild.lib;avcodecd.lib;avformatd.lib;swresampled.lib;postprocd.lib;swscaled.lib;assd.lib;fontconfigd.lib;freetyped.lib;fribidid.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <LargeAddressAware>true</LargeAddressAware>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -872,7 +872,7 @@ echo            These errors are the result of dead code elimination not being p
      <ProgramDatabaseFile>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDatabaseFile>
      <ModuleDefinitionFile>.\libavfilter.def</ModuleDefinitionFile>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>avutild.lib;avformatd.lib;avcodecd.lib;swresampled.lib;postprocd.lib;swscaled.lib;assd.lib;fontconfigd.lib;freetyped.lib;fribidid.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avutild.lib;avcodecd.lib;avformatd.lib;swresampled.lib;postprocd.lib;swscaled.lib;assd.lib;fontconfigd.lib;freetyped.lib;fribidid.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ForceFileOutput>UndefinedSymbolOnly</ForceFileOutput>
@@ -954,7 +954,7 @@ echo            These errors are the result of dead code elimination not being p
      <ProgramDatabaseFile>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDatabaseFile>
      <ModuleDefinitionFile>.\libavfilter.def</ModuleDefinitionFile>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>avutild.lib;avformatd.lib;avcodecd.lib;swresampled.lib;postprocd.lib;swscaled.lib;libassd.lib;libfontconfigd.lib;libfreetyped.lib;libfribidid.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avutild.lib;avcodecd.lib;avformatd.lib;swresampled.lib;postprocd.lib;swscaled.lib;libassd.lib;libfontconfigd.lib;libfreetyped.lib;libfribidid.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <LargeAddressAware>true</LargeAddressAware>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -1037,7 +1037,7 @@ echo            These errors are the result of dead code elimination not being p
      <ProgramDatabaseFile>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDatabaseFile>
      <ModuleDefinitionFile>.\libavfilter.def</ModuleDefinitionFile>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>avutild.lib;avformatd.lib;avcodecd.lib;swresampled.lib;postprocd.lib;swscaled.lib;libassd.lib;libfontconfigd.lib;libfreetyped.lib;libfribidid.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avutild.lib;avcodecd.lib;avformatd.lib;swresampled.lib;postprocd.lib;swscaled.lib;libassd.lib;libfontconfigd.lib;libfreetyped.lib;libfribidid.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ForceFileOutput>UndefinedSymbolOnly</ForceFileOutput>
@@ -1283,7 +1283,7 @@ cd $(ProjectDir)
      <ProgramDatabaseFile>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDatabaseFile>
      <ModuleDefinitionFile>.\libavfilter.def</ModuleDefinitionFile>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>avutil.lib;avformat.lib;avcodec.lib;swresample.lib;postproc.lib;swscale.lib;ass.lib;fontconfig.lib;freetype.lib;fribidi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avutil.lib;avcodec.lib;avformat.lib;swresample.lib;postproc.lib;swscale.lib;ass.lib;fontconfig.lib;freetype.lib;fribidi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <LargeAddressAware>true</LargeAddressAware>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
@@ -1367,7 +1367,7 @@ cd $(ProjectDir)
      <ProgramDatabaseFile>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDatabaseFile>
      <ModuleDefinitionFile>.\libavfilter.def</ModuleDefinitionFile>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>avutil.lib;avformat.lib;avcodec.lib;swresample.lib;postproc.lib;swscale.lib;ass.lib;fontconfig.lib;freetype.lib;fribidi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avutil.lib;avcodec.lib;avformat.lib;swresample.lib;postproc.lib;swscale.lib;ass.lib;fontconfig.lib;freetype.lib;fribidi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
    </Link>
@@ -1450,7 +1450,7 @@ cd $(ProjectDir)
      <ProgramDatabaseFile>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDatabaseFile>
      <ModuleDefinitionFile>.\libavfilter.def</ModuleDefinitionFile>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>avutil.lib;avformat.lib;avcodec.lib;swresample.lib;postproc.lib;swscale.lib;libass.lib;libfontconfig.lib;libfreetype.lib;libfribidi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avutil.lib;avcodec.lib;avformat.lib;swresample.lib;postproc.lib;swscale.lib;libass.lib;libfontconfig.lib;libfreetype.lib;libfribidi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <LargeAddressAware>true</LargeAddressAware>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
@@ -1534,7 +1534,7 @@ cd $(ProjectDir)
      <ProgramDatabaseFile>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDatabaseFile>
      <ModuleDefinitionFile>.\libavfilter.def</ModuleDefinitionFile>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>avutil.lib;avformat.lib;avcodec.lib;swresample.lib;postproc.lib;swscale.lib;libass.lib;libfontconfig.lib;libfreetype.lib;libfribidi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avutil.lib;avcodec.lib;avformat.lib;swresample.lib;postproc.lib;swscale.lib;libass.lib;libfontconfig.lib;libfreetype.lib;libfribidi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
    </Link>