projects: Update for recent upstream merge.

900610b7 · Matt Oliver · 68f0c1d9 · 900610b7 · 900610b7 · 900610b7
8 changed file
--- a/SMP/config.asm
+++ b/SMP/config.asm
@@ -453,8 +453,20 @@
 %define CONFIG_SCALING_VIDEO_EXAMPLE 0
 %define CONFIG_TRANSCODE_AAC_EXAMPLE 0
 %define CONFIG_TRANSCODING_EXAMPLE 0
-%define CONFIG_AVISYNTH 1
 %define CONFIG_BZLIB 1
+%define CONFIG_ICONV 1
+%define CONFIG_LIBXCB 0
+%define CONFIG_LIBXCB_SHM 0
+%define CONFIG_LIBXCB_SHAPE 0
+%define CONFIG_LIBXCB_XFIXES 0
+%define CONFIG_LZMA 1
+%define CONFIG_SCHANNEL 0
+%define CONFIG_SDL 1
+%define CONFIG_SDL2 1
+%define CONFIG_SECURETRANSPORT 0
+%define CONFIG_XLIB 0
+%define CONFIG_ZLIB 1
+%define CONFIG_AVISYNTH 1
 %define CONFIG_CHROMAPRINT 0
 %define CONFIG_CRYSTALHD 0
 %define CONFIG_DECKLINK 0
@@ -462,7 +474,6 @@
 %define CONFIG_GCRYPT 0
 %define CONFIG_GMP 1
 %define CONFIG_GNUTLS 1
-%define CONFIG_ICONV 1
 %define CONFIG_JNI 0
 %define CONFIG_LADSPA 0
 %define CONFIG_LIBASS 1
@@ -515,44 +526,33 @@
 %define CONFIG_LIBX264 1
 %define CONFIG_LIBX265 1
 %define CONFIG_LIBXAVS 0
-%define CONFIG_LIBXCB 0
-%define CONFIG_LIBXCB_SHM 0
-%define CONFIG_LIBXCB_SHAPE 0
-%define CONFIG_LIBXCB_XFIXES 0
 %define CONFIG_LIBXVID 1
 %define CONFIG_LIBZIMG 0
 %define CONFIG_LIBZMQ 0
 %define CONFIG_LIBZVBI 0
-%define CONFIG_LZMA 1
 %define CONFIG_MEDIACODEC 0
 %define CONFIG_NETCDF 0
 %define CONFIG_OPENAL 0
 %define CONFIG_OPENCL 0
 %define CONFIG_OPENGL 1
 %define CONFIG_OPENSSL 0
-%define CONFIG_SCHANNEL 0
-%define CONFIG_SDL 1
-%define CONFIG_SDL2 1
-%define CONFIG_SECURETRANSPORT 0
 %define CONFIG_VIDEOTOOLBOX 0
 %define CONFIG_X11GRAB 0
-%define CONFIG_XLIB 0
-%define CONFIG_ZLIB 1
 %define CONFIG_AUDIOTOOLBOX 0
 %define CONFIG_CUDA 1
 %define CONFIG_CUVID 1
 %define CONFIG_D3D11VA 1
 %define CONFIG_DXVA2 1
-%define CONFIG_LIBMFX 1
-%define CONFIG_LIBNPP 0
-%define CONFIG_MMAL 0
 %define CONFIG_NVENC 1
-%define CONFIG_OMX 0
 %define CONFIG_VAAPI 0
 %define CONFIG_VDA 0
 %define CONFIG_VDPAU 0
 %define CONFIG_VIDEOTOOLBOX_HWACCEL 0
 %define CONFIG_XVMC 0
+%define CONFIG_LIBMFX 1
+%define CONFIG_LIBNPP 0
+%define CONFIG_MMAL 0
+%define CONFIG_OMX 0
 %define CONFIG_FTRAPV 0
 %define CONFIG_GRAY 0
 %define CONFIG_HARDCODED_TABLES 0

--- a/SMP/config.h
+++ b/SMP/config.h
@@ -495,8 +495,20 @@
 #define CONFIG_SCALING_VIDEO_EXAMPLE 0
 #define CONFIG_TRANSCODE_AAC_EXAMPLE 0
 #define CONFIG_TRANSCODING_EXAMPLE 0
-#define CONFIG_AVISYNTH 1
 #define CONFIG_BZLIB 1
+#define CONFIG_ICONV 1
+#define CONFIG_LIBXCB 0
+#define CONFIG_LIBXCB_SHM 0
+#define CONFIG_LIBXCB_SHAPE 0
+#define CONFIG_LIBXCB_XFIXES 0
+#define CONFIG_LZMA 1
+#define CONFIG_SCHANNEL 0
+#define CONFIG_SDL 1
+#define CONFIG_SDL2 1
+#define CONFIG_SECURETRANSPORT 0
+#define CONFIG_XLIB 0
+#define CONFIG_ZLIB 1
+#define CONFIG_AVISYNTH 1
 #define CONFIG_CHROMAPRINT 0
 #define CONFIG_CRYSTALHD 0
 #define CONFIG_DECKLINK 0
@@ -504,7 +516,6 @@
 #define CONFIG_GCRYPT 0
 #define CONFIG_GMP 1
 #define CONFIG_GNUTLS 1
-#define CONFIG_ICONV 1
 #define CONFIG_JNI 0
 #define CONFIG_LADSPA 0
 #define CONFIG_LIBASS 1
@@ -557,44 +568,33 @@
 #define CONFIG_LIBX264 1
 #define CONFIG_LIBX265 1
 #define CONFIG_LIBXAVS 0
-#define CONFIG_LIBXCB 0
-#define CONFIG_LIBXCB_SHM 0
-#define CONFIG_LIBXCB_SHAPE 0
-#define CONFIG_LIBXCB_XFIXES 0
 #define CONFIG_LIBXVID 1
 #define CONFIG_LIBZIMG 0
 #define CONFIG_LIBZMQ 0
 #define CONFIG_LIBZVBI 0
-#define CONFIG_LZMA 1
 #define CONFIG_MEDIACODEC 0
 #define CONFIG_NETCDF 0
 #define CONFIG_OPENAL 0
 #define CONFIG_OPENCL 0
 #define CONFIG_OPENGL 1
 #define CONFIG_OPENSSL 0
-#define CONFIG_SCHANNEL 0
-#define CONFIG_SDL 1
-#define CONFIG_SDL2 1
-#define CONFIG_SECURETRANSPORT 0
 #define CONFIG_VIDEOTOOLBOX 0
 #define CONFIG_X11GRAB 0
-#define CONFIG_XLIB 0
-#define CONFIG_ZLIB 1
 #define CONFIG_AUDIOTOOLBOX 0
 #define CONFIG_CUDA 1
 #define CONFIG_CUVID 1
 #define CONFIG_D3D11VA 1
 #define CONFIG_DXVA2 1
-#define CONFIG_LIBMFX 1
-#define CONFIG_LIBNPP 0
-#define CONFIG_MMAL 0
 #define CONFIG_NVENC 1
-#define CONFIG_OMX 0
 #define CONFIG_VAAPI 0
 #define CONFIG_VDA 0
 #define CONFIG_VDPAU 0
 #define CONFIG_VIDEOTOOLBOX_HWACCEL 0
 #define CONFIG_XVMC 0
+#define CONFIG_LIBMFX 1
+#define CONFIG_LIBNPP 0
+#define CONFIG_MMAL 0
+#define CONFIG_OMX 0
 #define CONFIG_FTRAPV 0
 #define CONFIG_GRAY 0
 #define CONFIG_HARDCODED_TABLES 0

--- a/SMP/libavcodec.vcxproj
+++ b/SMP/libavcodec.vcxproj
@@ -1371,7 +1371,7 @@
      <TargetMachine>MachineX86</TargetMachine>
      <SubSystem>Windows</SubSystem>
      <OutputFile>$(OutDir)\lib\x86\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libbz2d.lib;libiconvd.lib;libilbcd.lib;libmp3lamed.lib;libopusd.lib;libspeexd.lib;libtheorad.lib;libvorbisd.lib;libvpxd.lib;libx264d.lib;libx265d.lib;libxvidcored.lib;liblzmad.lib;libzlibd.lib;libmfxd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libbz2d.lib;libiconvd.lib;liblzmad.lib;libzlibd.lib;libilbcd.lib;libmp3lamed.lib;libopusd.lib;libspeexd.lib;libtheorad.lib;libvorbisd.lib;libvpxd.lib;libx264d.lib;libx265d.lib;libxvidcored.lib;libmfxd.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
    </Lib>
@@ -1455,7 +1455,7 @@ cd $(ProjectDir)
      <TargetMachine>MachineX64</TargetMachine>
      <SubSystem>Windows</SubSystem>
      <OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libbz2d.lib;libiconvd.lib;libilbcd.lib;libmp3lamed.lib;libopusd.lib;libspeexd.lib;libtheorad.lib;libvorbisd.lib;libvpxd.lib;libx264d.lib;libx265d.lib;libxvidcored.lib;liblzmad.lib;libzlibd.lib;libmfxd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libbz2d.lib;libiconvd.lib;liblzmad.lib;libzlibd.lib;libilbcd.lib;libmp3lamed.lib;libopusd.lib;libspeexd.lib;libtheorad.lib;libvorbisd.lib;libvpxd.lib;libx264d.lib;libx265d.lib;libxvidcored.lib;libmfxd.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
    </Lib>
@@ -1542,7 +1542,7 @@ cd $(ProjectDir)
      <ProgramDatabaseFile>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDatabaseFile>
      <ModuleDefinitionFile>.\libavcodec.def</ModuleDefinitionFile>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>avutild.lib;swresampled.lib;bz2d.lib;iconvd.lib;ilbcd.lib;mp3lamed.lib;opusd.lib;speexd.lib;theorad.lib;vorbisd.lib;vpxd.lib;x264d.lib;x265d.lib;xvidcored.lib;lzmad.lib;zlibd.lib;mfxd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avutild.lib;swresampled.lib;bz2d.lib;iconvd.lib;lzmad.lib;zlibd.lib;ilbcd.lib;mp3lamed.lib;opusd.lib;speexd.lib;theorad.lib;vorbisd.lib;vpxd.lib;x264d.lib;x265d.lib;xvidcored.lib;mfxd.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <LargeAddressAware>true</LargeAddressAware>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -1637,7 +1637,7 @@ echo            These errors are the result of dead code elimination not being p
      <ProgramDatabaseFile>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDatabaseFile>
      <ModuleDefinitionFile>.\libavcodec.def</ModuleDefinitionFile>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>avutild.lib;swresampled.lib;bz2d.lib;iconvd.lib;ilbcd.lib;mp3lamed.lib;opusd.lib;speexd.lib;theorad.lib;vorbisd.lib;vpxd.lib;x264d.lib;x265d.lib;xvidcored.lib;lzmad.lib;zlibd.lib;mfxd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avutild.lib;swresampled.lib;bz2d.lib;iconvd.lib;lzmad.lib;zlibd.lib;ilbcd.lib;mp3lamed.lib;opusd.lib;speexd.lib;theorad.lib;vorbisd.lib;vpxd.lib;x264d.lib;x265d.lib;xvidcored.lib;mfxd.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ForceFileOutput>UndefinedSymbolOnly</ForceFileOutput>
@@ -1731,7 +1731,7 @@ echo            These errors are the result of dead code elimination not being p
      <ProgramDatabaseFile>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDatabaseFile>
      <ModuleDefinitionFile>.\libavcodec.def</ModuleDefinitionFile>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>avutild.lib;swresampled.lib;libbz2d.lib;libiconvd.lib;libilbcd.lib;libmp3lamed.lib;libopusd.lib;libspeexd.lib;libtheorad.lib;libvorbisd.lib;libvpxd.lib;libx264d.lib;libx265d.lib;libxvidcored.lib;liblzmad.lib;libzlibd.lib;libmfxd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avutild.lib;swresampled.lib;libbz2d.lib;libiconvd.lib;liblzmad.lib;libzlibd.lib;libilbcd.lib;libmp3lamed.lib;libopusd.lib;libspeexd.lib;libtheorad.lib;libvorbisd.lib;libvpxd.lib;libx264d.lib;libx265d.lib;libxvidcored.lib;libmfxd.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <LargeAddressAware>true</LargeAddressAware>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -1826,7 +1826,7 @@ echo            These errors are the result of dead code elimination not being p
      <ProgramDatabaseFile>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDatabaseFile>
      <ModuleDefinitionFile>.\libavcodec.def</ModuleDefinitionFile>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>avutild.lib;swresampled.lib;libbz2d.lib;libiconvd.lib;libilbcd.lib;libmp3lamed.lib;libopusd.lib;libspeexd.lib;libtheorad.lib;libvorbisd.lib;libvpxd.lib;libx264d.lib;libx265d.lib;libxvidcored.lib;liblzmad.lib;libzlibd.lib;libmfxd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avutild.lib;swresampled.lib;libbz2d.lib;libiconvd.lib;liblzmad.lib;libzlibd.lib;libilbcd.lib;libmp3lamed.lib;libopusd.lib;libspeexd.lib;libtheorad.lib;libvorbisd.lib;libvpxd.lib;libx264d.lib;libx265d.lib;libxvidcored.lib;libmfxd.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ForceFileOutput>UndefinedSymbolOnly</ForceFileOutput>
@@ -1923,7 +1923,7 @@ echo            These errors are the result of dead code elimination not being p
      <TargetMachine>MachineX86</TargetMachine>
      <SubSystem>Windows</SubSystem>
      <OutputFile>$(OutDir)\lib\x86\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libbz2.lib;libiconv.lib;libilbc.lib;libmp3lame.lib;libopus.lib;libspeex.lib;libtheora.lib;libvorbis.lib;libvpx.lib;libx264.lib;libx265.lib;libxvidcore.lib;liblzma.lib;libzlib.lib;libmfx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libbz2.lib;libiconv.lib;liblzma.lib;libzlib.lib;libilbc.lib;libmp3lame.lib;libopus.lib;libspeex.lib;libtheora.lib;libvorbis.lib;libvpx.lib;libx264.lib;libx265.lib;libxvidcore.lib;libmfx.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
    </Lib>
@@ -2013,7 +2013,7 @@ cd $(ProjectDir)
      <TargetMachine>MachineX64</TargetMachine>
      <SubSystem>Windows</SubSystem>
      <OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libbz2.lib;libiconv.lib;libilbc.lib;libmp3lame.lib;libopus.lib;libspeex.lib;libtheora.lib;libvorbis.lib;libvpx.lib;libx264.lib;libx265.lib;libxvidcore.lib;liblzma.lib;libzlib.lib;libmfx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libbz2.lib;libiconv.lib;liblzma.lib;libzlib.lib;libilbc.lib;libmp3lame.lib;libopus.lib;libspeex.lib;libtheora.lib;libvorbis.lib;libvpx.lib;libx264.lib;libx265.lib;libxvidcore.lib;libmfx.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
    </Lib>
@@ -2108,7 +2108,7 @@ cd $(ProjectDir)
      <ProgramDatabaseFile>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDatabaseFile>
      <ModuleDefinitionFile>.\libavcodec.def</ModuleDefinitionFile>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>avutil.lib;swresample.lib;bz2.lib;iconv.lib;ilbc.lib;mp3lame.lib;opus.lib;speex.lib;theora.lib;vorbis.lib;vpx.lib;x264.lib;x265.lib;xvidcore.lib;lzma.lib;zlib.lib;mfx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avutil.lib;swresample.lib;bz2.lib;iconv.lib;lzma.lib;zlib.lib;ilbc.lib;mp3lame.lib;opus.lib;speex.lib;theora.lib;vorbis.lib;vpx.lib;x264.lib;x265.lib;xvidcore.lib;mfx.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <LargeAddressAware>true</LargeAddressAware>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
@@ -2205,7 +2205,7 @@ cd $(ProjectDir)
      <ProgramDatabaseFile>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDatabaseFile>
      <ModuleDefinitionFile>.\libavcodec.def</ModuleDefinitionFile>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>avutil.lib;swresample.lib;bz2.lib;iconv.lib;ilbc.lib;mp3lame.lib;opus.lib;speex.lib;theora.lib;vorbis.lib;vpx.lib;x264.lib;x265.lib;xvidcore.lib;lzma.lib;zlib.lib;mfx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avutil.lib;swresample.lib;bz2.lib;iconv.lib;lzma.lib;zlib.lib;ilbc.lib;mp3lame.lib;opus.lib;speex.lib;theora.lib;vorbis.lib;vpx.lib;x264.lib;x265.lib;xvidcore.lib;mfx.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -2301,7 +2301,7 @@ cd $(ProjectDir)
      <ProgramDatabaseFile>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDatabaseFile>
      <ModuleDefinitionFile>.\libavcodec.def</ModuleDefinitionFile>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>avutil.lib;swresample.lib;libbz2.lib;libiconv.lib;libilbc.lib;libmp3lame.lib;libopus.lib;libspeex.lib;libtheora.lib;libvorbis.lib;libvpx.lib;libx264.lib;libx265.lib;libxvidcore.lib;liblzma.lib;libzlib.lib;libmfx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avutil.lib;swresample.lib;libbz2.lib;libiconv.lib;liblzma.lib;libzlib.lib;libilbc.lib;libmp3lame.lib;libopus.lib;libspeex.lib;libtheora.lib;libvorbis.lib;libvpx.lib;libx264.lib;libx265.lib;libxvidcore.lib;libmfx.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <LargeAddressAware>true</LargeAddressAware>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
@@ -2398,7 +2398,7 @@ cd $(ProjectDir)
      <ProgramDatabaseFile>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDatabaseFile>
      <ModuleDefinitionFile>.\libavcodec.def</ModuleDefinitionFile>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>avutil.lib;swresample.lib;libbz2.lib;libiconv.lib;libilbc.lib;libmp3lame.lib;libopus.lib;libspeex.lib;libtheora.lib;libvorbis.lib;libvpx.lib;libx264.lib;libx265.lib;libxvidcore.lib;liblzma.lib;libzlib.lib;libmfx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avutil.lib;swresample.lib;libbz2.lib;libiconv.lib;liblzma.lib;libzlib.lib;libilbc.lib;libmp3lame.lib;libopus.lib;libspeex.lib;libtheora.lib;libvorbis.lib;libvpx.lib;libx264.lib;libx265.lib;libxvidcore.lib;libmfx.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -2489,7 +2489,7 @@ cd $(ProjectDir)
      <TargetMachine>MachineX86</TargetMachine>
      <SubSystem>Windows</SubSystem>
      <OutputFile>$(OutDir)\lib\x86\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libbz2.lib;libiconv.lib;libilbc.lib;libmp3lame.lib;libopus.lib;libspeex.lib;libtheora.lib;libvorbis.lib;libvpx.lib;libx264.lib;libx265.lib;libxvidcore.lib;liblzma.lib;libzlib.lib;libmfx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libbz2.lib;libiconv.lib;liblzma.lib;libzlib.lib;libilbc.lib;libmp3lame.lib;libopus.lib;libspeex.lib;libtheora.lib;libvorbis.lib;libvpx.lib;libx264.lib;libx265.lib;libxvidcore.lib;libmfx.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
    </Lib>
@@ -2579,7 +2579,7 @@ cd $(ProjectDir)
      <TargetMachine>MachineX64</TargetMachine>
      <SubSystem>Windows</SubSystem>
      <OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libbz2.lib;libiconv.lib;libilbc.lib;libmp3lame.lib;libopus.lib;libspeex.lib;libtheora.lib;libvorbis.lib;libvpx.lib;libx264.lib;libx265.lib;libxvidcore.lib;liblzma.lib;libzlib.lib;libmfx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libbz2.lib;libiconv.lib;liblzma.lib;libzlib.lib;libilbc.lib;libmp3lame.lib;libopus.lib;libspeex.lib;libtheora.lib;libvorbis.lib;libvpx.lib;libx264.lib;libx265.lib;libxvidcore.lib;libmfx.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
    </Lib>

--- a/SMP/libavdevice.vcxproj
+++ b/SMP/libavdevice.vcxproj
@@ -353,7 +353,7 @@
      <TargetMachine>MachineX86</TargetMachine>
      <SubSystem>Windows</SubSystem>
      <OutputFile>$(OutDir)\lib\x86\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libcdio_paranoiad.lib;libsdl2d.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libsdl2d.lib;libcdio_paranoiad.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
    </Lib>
@@ -417,7 +417,7 @@ cd $(ProjectDir)
      <TargetMachine>MachineX64</TargetMachine>
      <SubSystem>Windows</SubSystem>
      <OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libcdio_paranoiad.lib;libsdl2d.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libsdl2d.lib;libcdio_paranoiad.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
    </Lib>
@@ -484,7 +484,7 @@ cd $(ProjectDir)
      <ProgramDatabaseFile>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDatabaseFile>
      <ModuleDefinitionFile>.\libavdevice.def</ModuleDefinitionFile>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>avformatd.lib;avcodecd.lib;avutild.lib;avfilterd.lib;cdio_paranoiad.lib;sdl2d.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avformatd.lib;avcodecd.lib;avutild.lib;avfilterd.lib;sdl2d.lib;cdio_paranoiad.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <LargeAddressAware>true</LargeAddressAware>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -559,7 +559,7 @@ echo            These errors are the result of dead code elimination not being p
      <ProgramDatabaseFile>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDatabaseFile>
      <ModuleDefinitionFile>.\libavdevice.def</ModuleDefinitionFile>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>avformatd.lib;avcodecd.lib;avutild.lib;avfilterd.lib;cdio_paranoiad.lib;sdl2d.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avformatd.lib;avcodecd.lib;avutild.lib;avfilterd.lib;sdl2d.lib;cdio_paranoiad.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ForceFileOutput>UndefinedSymbolOnly</ForceFileOutput>
@@ -633,7 +633,7 @@ echo            These errors are the result of dead code elimination not being p
      <ProgramDatabaseFile>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDatabaseFile>
      <ModuleDefinitionFile>.\libavdevice.def</ModuleDefinitionFile>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>avformatd.lib;avcodecd.lib;avutild.lib;avfilterd.lib;libcdio_paranoiad.lib;libsdl2d.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avformatd.lib;avcodecd.lib;avutild.lib;avfilterd.lib;libsdl2d.lib;libcdio_paranoiad.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <LargeAddressAware>true</LargeAddressAware>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -708,7 +708,7 @@ echo            These errors are the result of dead code elimination not being p
      <ProgramDatabaseFile>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDatabaseFile>
      <ModuleDefinitionFile>.\libavdevice.def</ModuleDefinitionFile>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>avformatd.lib;avcodecd.lib;avutild.lib;avfilterd.lib;libcdio_paranoiad.lib;libsdl2d.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avformatd.lib;avcodecd.lib;avutild.lib;avfilterd.lib;libsdl2d.lib;libcdio_paranoiad.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ForceFileOutput>UndefinedSymbolOnly</ForceFileOutput>
@@ -785,7 +785,7 @@ echo            These errors are the result of dead code elimination not being p
      <TargetMachine>MachineX86</TargetMachine>
      <SubSystem>Windows</SubSystem>
      <OutputFile>$(OutDir)\lib\x86\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libcdio_paranoia.lib;libsdl2.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libsdl2.lib;libcdio_paranoia.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
    </Lib>
@@ -855,7 +855,7 @@ cd $(ProjectDir)
      <TargetMachine>MachineX64</TargetMachine>
      <SubSystem>Windows</SubSystem>
      <OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libcdio_paranoia.lib;libsdl2.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libsdl2.lib;libcdio_paranoia.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
    </Lib>
@@ -930,7 +930,7 @@ cd $(ProjectDir)
      <ProgramDatabaseFile>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDatabaseFile>
      <ModuleDefinitionFile>.\libavdevice.def</ModuleDefinitionFile>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>avformat.lib;avcodec.lib;avutil.lib;avfilter.lib;cdio_paranoia.lib;sdl2.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avformat.lib;avcodec.lib;avutil.lib;avfilter.lib;sdl2.lib;cdio_paranoia.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <LargeAddressAware>true</LargeAddressAware>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
@@ -1007,7 +1007,7 @@ cd $(ProjectDir)
      <ProgramDatabaseFile>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDatabaseFile>
      <ModuleDefinitionFile>.\libavdevice.def</ModuleDefinitionFile>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>avformat.lib;avcodec.lib;avutil.lib;avfilter.lib;cdio_paranoia.lib;sdl2.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avformat.lib;avcodec.lib;avutil.lib;avfilter.lib;sdl2.lib;cdio_paranoia.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -1083,7 +1083,7 @@ cd $(ProjectDir)
      <ProgramDatabaseFile>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDatabaseFile>
      <ModuleDefinitionFile>.\libavdevice.def</ModuleDefinitionFile>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>avformat.lib;avcodec.lib;avutil.lib;avfilter.lib;libcdio_paranoia.lib;libsdl2.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avformat.lib;avcodec.lib;avutil.lib;avfilter.lib;libsdl2.lib;libcdio_paranoia.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <LargeAddressAware>true</LargeAddressAware>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
@@ -1160,7 +1160,7 @@ cd $(ProjectDir)
      <ProgramDatabaseFile>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDatabaseFile>
      <ModuleDefinitionFile>.\libavdevice.def</ModuleDefinitionFile>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>avformat.lib;avcodec.lib;avutil.lib;avfilter.lib;libcdio_paranoia.lib;libsdl2.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avformat.lib;avcodec.lib;avutil.lib;avfilter.lib;libsdl2.lib;libcdio_paranoia.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -1231,7 +1231,7 @@ cd $(ProjectDir)
      <TargetMachine>MachineX86</TargetMachine>
      <SubSystem>Windows</SubSystem>
      <OutputFile>$(OutDir)\lib\x86\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libcdio_paranoia.lib;libsdl2.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libsdl2.lib;libcdio_paranoia.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
    </Lib>
@@ -1301,7 +1301,7 @@ cd $(ProjectDir)
      <TargetMachine>MachineX64</TargetMachine>
      <SubSystem>Windows</SubSystem>
      <OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libcdio_paranoia.lib;libsdl2.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libsdl2.lib;libcdio_paranoia.lib;Opengl32.lib;strmiids.lib;vfw32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
    </Lib>

--- a/SMP/libavformat.vcxproj
+++ b/SMP/libavformat.vcxproj
@@ -777,7 +777,7 @@
      <TargetMachine>MachineX86</TargetMachine>
      <SubSystem>Windows</SubSystem>
      <OutputFile>$(OutDir)\lib\x86\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libbz2d.lib;libgmpd.lib;libgnutlsd.lib;libblurayd.lib;libgmed.lib;libmodplugd.lib;libsshd.lib;libzlibd.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libbz2d.lib;libzlibd.lib;libgmpd.lib;libgnutlsd.lib;libblurayd.lib;libgmed.lib;libmodplugd.lib;libsshd.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
    </Lib>
@@ -842,7 +842,7 @@ cd $(ProjectDir)
      <TargetMachine>MachineX64</TargetMachine>
      <SubSystem>Windows</SubSystem>
      <OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libbz2d.lib;libgmpd.lib;libgnutlsd.lib;libblurayd.lib;libgmed.lib;libmodplugd.lib;libsshd.lib;libzlibd.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libbz2d.lib;libzlibd.lib;libgmpd.lib;libgnutlsd.lib;libblurayd.lib;libgmed.lib;libmodplugd.lib;libsshd.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
    </Lib>
@@ -910,7 +910,7 @@ cd $(ProjectDir)
      <ProgramDatabaseFile>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDatabaseFile>
      <ModuleDefinitionFile>.\libavformat.def</ModuleDefinitionFile>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>avcodecd.lib;avutild.lib;bz2d.lib;gmpd.lib;gnutlsd.lib;blurayd.lib;gmed.lib;modplugd.lib;sshd.lib;zlibd.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avcodecd.lib;avutild.lib;bz2d.lib;zlibd.lib;gmpd.lib;gnutlsd.lib;blurayd.lib;gmed.lib;modplugd.lib;sshd.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <LargeAddressAware>true</LargeAddressAware>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -986,7 +986,7 @@ echo            These errors are the result of dead code elimination not being p
      <ProgramDatabaseFile>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDatabaseFile>
      <ModuleDefinitionFile>.\libavformat.def</ModuleDefinitionFile>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>avcodecd.lib;avutild.lib;bz2d.lib;gmpd.lib;gnutlsd.lib;blurayd.lib;gmed.lib;modplugd.lib;sshd.lib;zlibd.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avcodecd.lib;avutild.lib;bz2d.lib;zlibd.lib;gmpd.lib;gnutlsd.lib;blurayd.lib;gmed.lib;modplugd.lib;sshd.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ForceFileOutput>UndefinedSymbolOnly</ForceFileOutput>
@@ -1061,7 +1061,7 @@ echo            These errors are the result of dead code elimination not being p
      <ProgramDatabaseFile>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDatabaseFile>
      <ModuleDefinitionFile>.\libavformat.def</ModuleDefinitionFile>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>avcodecd.lib;avutild.lib;libbz2d.lib;libgmpd.lib;libgnutlsd.lib;libblurayd.lib;libgmed.lib;libmodplugd.lib;libsshd.lib;libzlibd.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avcodecd.lib;avutild.lib;libbz2d.lib;libzlibd.lib;libgmpd.lib;libgnutlsd.lib;libblurayd.lib;libgmed.lib;libmodplugd.lib;libsshd.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <LargeAddressAware>true</LargeAddressAware>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -1137,7 +1137,7 @@ echo            These errors are the result of dead code elimination not being p
      <ProgramDatabaseFile>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDatabaseFile>
      <ModuleDefinitionFile>.\libavformat.def</ModuleDefinitionFile>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>avcodecd.lib;avutild.lib;libbz2d.lib;libgmpd.lib;libgnutlsd.lib;libblurayd.lib;libgmed.lib;libmodplugd.lib;libsshd.lib;libzlibd.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avcodecd.lib;avutild.lib;libbz2d.lib;libzlibd.lib;libgmpd.lib;libgnutlsd.lib;libblurayd.lib;libgmed.lib;libmodplugd.lib;libsshd.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ForceFileOutput>UndefinedSymbolOnly</ForceFileOutput>
@@ -1215,7 +1215,7 @@ echo            These errors are the result of dead code elimination not being p
      <TargetMachine>MachineX86</TargetMachine>
      <SubSystem>Windows</SubSystem>
      <OutputFile>$(OutDir)\lib\x86\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libbz2.lib;libgmp.lib;libgnutls.lib;libbluray.lib;libgme.lib;libmodplug.lib;libssh.lib;libzlib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libbz2.lib;libzlib.lib;libgmp.lib;libgnutls.lib;libbluray.lib;libgme.lib;libmodplug.lib;libssh.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
    </Lib>
@@ -1286,7 +1286,7 @@ cd $(ProjectDir)
      <TargetMachine>MachineX64</TargetMachine>
      <SubSystem>Windows</SubSystem>
      <OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libbz2.lib;libgmp.lib;libgnutls.lib;libbluray.lib;libgme.lib;libmodplug.lib;libssh.lib;libzlib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libbz2.lib;libzlib.lib;libgmp.lib;libgnutls.lib;libbluray.lib;libgme.lib;libmodplug.lib;libssh.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
    </Lib>
@@ -1362,7 +1362,7 @@ cd $(ProjectDir)
      <ProgramDatabaseFile>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDatabaseFile>
      <ModuleDefinitionFile>.\libavformat.def</ModuleDefinitionFile>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>avcodec.lib;avutil.lib;bz2.lib;gmp.lib;gnutls.lib;bluray.lib;gme.lib;modplug.lib;ssh.lib;zlib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avcodec.lib;avutil.lib;bz2.lib;zlib.lib;gmp.lib;gnutls.lib;bluray.lib;gme.lib;modplug.lib;ssh.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <LargeAddressAware>true</LargeAddressAware>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
@@ -1440,7 +1440,7 @@ cd $(ProjectDir)
      <ProgramDatabaseFile>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDatabaseFile>
      <ModuleDefinitionFile>.\libavformat.def</ModuleDefinitionFile>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>avcodec.lib;avutil.lib;bz2.lib;gmp.lib;gnutls.lib;bluray.lib;gme.lib;modplug.lib;ssh.lib;zlib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avcodec.lib;avutil.lib;bz2.lib;zlib.lib;gmp.lib;gnutls.lib;bluray.lib;gme.lib;modplug.lib;ssh.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -1517,7 +1517,7 @@ cd $(ProjectDir)
      <ProgramDatabaseFile>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDatabaseFile>
      <ModuleDefinitionFile>.\libavformat.def</ModuleDefinitionFile>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>avcodec.lib;avutil.lib;libbz2.lib;libgmp.lib;libgnutls.lib;libbluray.lib;libgme.lib;libmodplug.lib;libssh.lib;libzlib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avcodec.lib;avutil.lib;libbz2.lib;libzlib.lib;libgmp.lib;libgnutls.lib;libbluray.lib;libgme.lib;libmodplug.lib;libssh.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <LargeAddressAware>true</LargeAddressAware>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
@@ -1595,7 +1595,7 @@ cd $(ProjectDir)
      <ProgramDatabaseFile>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDatabaseFile>
      <ModuleDefinitionFile>.\libavformat.def</ModuleDefinitionFile>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>avcodec.lib;avutil.lib;libbz2.lib;libgmp.lib;libgnutls.lib;libbluray.lib;libgme.lib;libmodplug.lib;libssh.lib;libzlib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avcodec.lib;avutil.lib;libbz2.lib;libzlib.lib;libgmp.lib;libgnutls.lib;libbluray.lib;libgme.lib;libmodplug.lib;libssh.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -1667,7 +1667,7 @@ cd $(ProjectDir)
      <TargetMachine>MachineX86</TargetMachine>
      <SubSystem>Windows</SubSystem>
      <OutputFile>$(OutDir)\lib\x86\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libbz2.lib;libgmp.lib;libgnutls.lib;libbluray.lib;libgme.lib;libmodplug.lib;libssh.lib;libzlib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libbz2.lib;libzlib.lib;libgmp.lib;libgnutls.lib;libbluray.lib;libgme.lib;libmodplug.lib;libssh.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
    </Lib>
@@ -1738,7 +1738,7 @@ cd $(ProjectDir)
      <TargetMachine>MachineX64</TargetMachine>
      <SubSystem>Windows</SubSystem>
      <OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libbz2.lib;libgmp.lib;libgnutls.lib;libbluray.lib;libgme.lib;libmodplug.lib;libssh.lib;libzlib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libbz2.lib;libzlib.lib;libgmp.lib;libgnutls.lib;libbluray.lib;libgme.lib;libmodplug.lib;libssh.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
    </Lib>

--- a/SMP/libavutil.def
+++ b/SMP/libavutil.def
@@ -245,6 +245,7 @@ EXPORTS
    av_image_alloc
    av_image_check_sar
    av_image_check_size
+    av_image_check_size2
    av_image_copy
    av_image_copy_plane
    av_image_copy_to_buffer
@@ -395,6 +396,7 @@ EXPORTS
    av_sha_update
    av_shr_i
    av_small_strptime
+    av_spherical_alloc
    av_stereo3d_alloc
    av_stereo3d_create_side_data
    av_stereo3d_from_name

--- a/SMP/libavutil.vcxproj
+++ b/SMP/libavutil.vcxproj
@@ -127,6 +127,7 @@
    <ClCompile Include="..\libavutil\samplefmt.c" />
    <ClCompile Include="..\libavutil\sha.c" />
    <ClCompile Include="..\libavutil\sha512.c" />
+    <ClCompile Include="..\libavutil\spherical.c" />
    <ClCompile Include="..\libavutil\stereo3d.c" />
    <ClCompile Include="..\libavutil\threadmessage.c" />
    <ClCompile Include="..\libavutil\time.c" />
@@ -226,6 +227,7 @@
    <ClInclude Include="..\libavutil\samplefmt.h" />
    <ClInclude Include="..\libavutil\sha.h" />
    <ClInclude Include="..\libavutil\sha512.h" />
+    <ClInclude Include="..\libavutil\spherical.h" />
    <ClInclude Include="..\libavutil\stereo3d.h" />
    <ClInclude Include="..\libavutil\threadmessage.h" />
    <ClInclude Include="..\libavutil\time.h" />
@@ -573,6 +575,7 @@ copy ..\libavutil\ripemd.h $(OutDir)\include\libavutil
 copy ..\libavutil\samplefmt.h $(OutDir)\include\libavutil
 copy ..\libavutil\sha.h $(OutDir)\include\libavutil
 copy ..\libavutil\sha512.h $(OutDir)\include\libavutil
+copy ..\libavutil\spherical.h $(OutDir)\include\libavutil
 copy ..\libavutil\stereo3d.h $(OutDir)\include\libavutil
 copy ..\libavutil\threadmessage.h $(OutDir)\include\libavutil
 copy ..\libavutil\time.h $(OutDir)\include\libavutil
@@ -714,6 +717,7 @@ copy ..\libavutil\ripemd.h $(OutDir)\include\libavutil
 copy ..\libavutil\samplefmt.h $(OutDir)\include\libavutil
 copy ..\libavutil\sha.h $(OutDir)\include\libavutil
 copy ..\libavutil\sha512.h $(OutDir)\include\libavutil
+copy ..\libavutil\spherical.h $(OutDir)\include\libavutil
 copy ..\libavutil\stereo3d.h $(OutDir)\include\libavutil
 copy ..\libavutil\threadmessage.h $(OutDir)\include\libavutil
 copy ..\libavutil\time.h $(OutDir)\include\libavutil
@@ -861,6 +865,7 @@ copy ..\libavutil\ripemd.h $(OutDir)\include\libavutil
 copy ..\libavutil\samplefmt.h $(OutDir)\include\libavutil
 copy ..\libavutil\sha.h $(OutDir)\include\libavutil
 copy ..\libavutil\sha512.h $(OutDir)\include\libavutil
+copy ..\libavutil\spherical.h $(OutDir)\include\libavutil
 copy ..\libavutil\stereo3d.h $(OutDir)\include\libavutil
 copy ..\libavutil\threadmessage.h $(OutDir)\include\libavutil
 copy ..\libavutil\time.h $(OutDir)\include\libavutil
@@ -1012,6 +1017,7 @@ copy ..\libavutil\ripemd.h $(OutDir)\include\libavutil
 copy ..\libavutil\samplefmt.h $(OutDir)\include\libavutil
 copy ..\libavutil\sha.h $(OutDir)\include\libavutil
 copy ..\libavutil\sha512.h $(OutDir)\include\libavutil
+copy ..\libavutil\spherical.h $(OutDir)\include\libavutil
 copy ..\libavutil\stereo3d.h $(OutDir)\include\libavutil
 copy ..\libavutil\threadmessage.h $(OutDir)\include\libavutil
 copy ..\libavutil\time.h $(OutDir)\include\libavutil
@@ -1164,6 +1170,7 @@ copy ..\libavutil\ripemd.h $(OutDir)\include\libavutil
 copy ..\libavutil\samplefmt.h $(OutDir)\include\libavutil
 copy ..\libavutil\sha.h $(OutDir)\include\libavutil
 copy ..\libavutil\sha512.h $(OutDir)\include\libavutil
+copy ..\libavutil\spherical.h $(OutDir)\include\libavutil
 copy ..\libavutil\stereo3d.h $(OutDir)\include\libavutil
 copy ..\libavutil\threadmessage.h $(OutDir)\include\libavutil
 copy ..\libavutil\time.h $(OutDir)\include\libavutil
@@ -1315,6 +1322,7 @@ copy ..\libavutil\ripemd.h $(OutDir)\include\libavutil
 copy ..\libavutil\samplefmt.h $(OutDir)\include\libavutil
 copy ..\libavutil\sha.h $(OutDir)\include\libavutil
 copy ..\libavutil\sha512.h $(OutDir)\include\libavutil
+copy ..\libavutil\spherical.h $(OutDir)\include\libavutil
 copy ..\libavutil\stereo3d.h $(OutDir)\include\libavutil
 copy ..\libavutil\threadmessage.h $(OutDir)\include\libavutil
 copy ..\libavutil\time.h $(OutDir)\include\libavutil
@@ -1467,6 +1475,7 @@ copy ..\libavutil\ripemd.h $(OutDir)\include\libavutil
 copy ..\libavutil\samplefmt.h $(OutDir)\include\libavutil
 copy ..\libavutil\sha.h $(OutDir)\include\libavutil
 copy ..\libavutil\sha512.h $(OutDir)\include\libavutil
+copy ..\libavutil\spherical.h $(OutDir)\include\libavutil
 copy ..\libavutil\stereo3d.h $(OutDir)\include\libavutil
 copy ..\libavutil\threadmessage.h $(OutDir)\include\libavutil
 copy ..\libavutil\time.h $(OutDir)\include\libavutil
@@ -1614,6 +1623,7 @@ copy ..\libavutil\ripemd.h $(OutDir)\include\libavutil
 copy ..\libavutil\samplefmt.h $(OutDir)\include\libavutil
 copy ..\libavutil\sha.h $(OutDir)\include\libavutil
 copy ..\libavutil\sha512.h $(OutDir)\include\libavutil
+copy ..\libavutil\spherical.h $(OutDir)\include\libavutil
 copy ..\libavutil\stereo3d.h $(OutDir)\include\libavutil
 copy ..\libavutil\threadmessage.h $(OutDir)\include\libavutil
 copy ..\libavutil\time.h $(OutDir)\include\libavutil
@@ -1768,6 +1778,7 @@ copy ..\libavutil\ripemd.h $(OutDir)\include\libavutil
 copy ..\libavutil\samplefmt.h $(OutDir)\include\libavutil
 copy ..\libavutil\sha.h $(OutDir)\include\libavutil
 copy ..\libavutil\sha512.h $(OutDir)\include\libavutil
+copy ..\libavutil\spherical.h $(OutDir)\include\libavutil
 copy ..\libavutil\stereo3d.h $(OutDir)\include\libavutil
 copy ..\libavutil\threadmessage.h $(OutDir)\include\libavutil
 copy ..\libavutil\time.h $(OutDir)\include\libavutil
@@ -1921,6 +1932,7 @@ copy ..\libavutil\ripemd.h $(OutDir)\include\libavutil
 copy ..\libavutil\samplefmt.h $(OutDir)\include\libavutil
 copy ..\libavutil\sha.h $(OutDir)\include\libavutil
 copy ..\libavutil\sha512.h $(OutDir)\include\libavutil
+copy ..\libavutil\spherical.h $(OutDir)\include\libavutil
 copy ..\libavutil\stereo3d.h $(OutDir)\include\libavutil
 copy ..\libavutil\threadmessage.h $(OutDir)\include\libavutil
 copy ..\libavutil\time.h $(OutDir)\include\libavutil
@@ -2075,6 +2087,7 @@ copy ..\libavutil\ripemd.h $(OutDir)\include\libavutil
 copy ..\libavutil\samplefmt.h $(OutDir)\include\libavutil
 copy ..\libavutil\sha.h $(OutDir)\include\libavutil
 copy ..\libavutil\sha512.h $(OutDir)\include\libavutil
+copy ..\libavutil\spherical.h $(OutDir)\include\libavutil
 copy ..\libavutil\stereo3d.h $(OutDir)\include\libavutil
 copy ..\libavutil\threadmessage.h $(OutDir)\include\libavutil
 copy ..\libavutil\time.h $(OutDir)\include\libavutil
@@ -2228,6 +2241,7 @@ copy ..\libavutil\ripemd.h $(OutDir)\include\libavutil
 copy ..\libavutil\samplefmt.h $(OutDir)\include\libavutil
 copy ..\libavutil\sha.h $(OutDir)\include\libavutil
 copy ..\libavutil\sha512.h $(OutDir)\include\libavutil
+copy ..\libavutil\spherical.h $(OutDir)\include\libavutil
 copy ..\libavutil\stereo3d.h $(OutDir)\include\libavutil
 copy ..\libavutil\threadmessage.h $(OutDir)\include\libavutil
 copy ..\libavutil\time.h $(OutDir)\include\libavutil
@@ -2375,6 +2389,7 @@ copy ..\libavutil\ripemd.h $(OutDir)\include\libavutil
 copy ..\libavutil\samplefmt.h $(OutDir)\include\libavutil
 copy ..\libavutil\sha.h $(OutDir)\include\libavutil
 copy ..\libavutil\sha512.h $(OutDir)\include\libavutil
+copy ..\libavutil\spherical.h $(OutDir)\include\libavutil
 copy ..\libavutil\stereo3d.h $(OutDir)\include\libavutil
 copy ..\libavutil\threadmessage.h $(OutDir)\include\libavutil
 copy ..\libavutil\time.h $(OutDir)\include\libavutil
@@ -2522,6 +2537,7 @@ copy ..\libavutil\ripemd.h $(OutDir)\include\libavutil
 copy ..\libavutil\samplefmt.h $(OutDir)\include\libavutil
 copy ..\libavutil\sha.h $(OutDir)\include\libavutil
 copy ..\libavutil\sha512.h $(OutDir)\include\libavutil
+copy ..\libavutil\spherical.h $(OutDir)\include\libavutil
 copy ..\libavutil\stereo3d.h $(OutDir)\include\libavutil
 copy ..\libavutil\threadmessage.h $(OutDir)\include\libavutil
 copy ..\libavutil\time.h $(OutDir)\include\libavutil

--- a/SMP/libavutil.vcxproj.filters
+++ b/SMP/libavutil.vcxproj.filters
@@ -210,6 +210,9 @@
    <ClCompile Include="..\libavutil\sha512.c">
      <Filter>Source Files\libavutil</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavutil\spherical.c">
+      <Filter>Source Files\libavutil</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavutil\stereo3d.c">
      <Filter>Source Files\libavutil</Filter>
    </ClCompile>
@@ -473,6 +476,9 @@
    <ClInclude Include="..\libavutil\sha512.h">
      <Filter>Header Files\libavutil</Filter>
    </ClInclude>
+    <ClInclude Include="..\libavutil\spherical.h">
+      <Filter>Header Files\libavutil</Filter>
+    </ClInclude>
    <ClInclude Include="..\libavutil\stereo3d.h">
      <Filter>Header Files\libavutil</Filter>
    </ClInclude>