projects: Update for recent merge.

SMP/config.asm

@@ -499,7 +499,6 @@
 %define CONFIG_MDCT 1
 %define CONFIG_PIXELUTILS 1
 %define CONFIG_NETWORK 1
-%define CONFIG_QSV 1
 %define CONFIG_RDFT 1
 %define CONFIG_FONTCONFIG 1
 %define CONFIG_INCOMPATIBLE_LIBAV_ABI 0
@@ -554,6 +553,7 @@
 %define CONFIG_NETTLE 1
 %define CONFIG_PIXBLOCKDSP 1
 %define CONFIG_QPELDSP 1
+%define CONFIG_QSV 1
 %define CONFIG_RANGECODER 1
 %define CONFIG_RIFFDEC 1
 %define CONFIG_RIFFENC 1

SMP/config.h

@@ -546,7 +546,6 @@
 #define CONFIG_MDCT 1
 #define CONFIG_PIXELUTILS 1
 #define CONFIG_NETWORK 1
-#define CONFIG_QSV 1
 #define CONFIG_RDFT 1
 #define CONFIG_FONTCONFIG 1
 #define CONFIG_INCOMPATIBLE_LIBAV_ABI 0
@@ -601,6 +600,7 @@
 #define CONFIG_NETTLE 1
 #define CONFIG_PIXBLOCKDSP 1
 #define CONFIG_QPELDSP 1
+#define CONFIG_QSV 1
 #define CONFIG_RANGECODER 1
 #define CONFIG_RIFFDEC 1
 #define CONFIG_RIFFENC 1

SMP/libavcodec.vcxproj

@@ -109,6 +109,7 @@
     <YASM Include="..\libavcodec\x86\hevc_res_add.asm" />
     <YASM Include="..\libavcodec\x86\hevc_sao.asm" />
     <YASM Include="..\libavcodec\x86\mlpdsp.asm" />
+    <YASM Include="..\libavcodec\x86\xvididct.asm" />
     <YASM Include="..\libavcodec\x86\proresdsp.asm" />
     <YASM Include="..\libavcodec\x86\rv34dsp.asm" />
     <YASM Include="..\libavcodec\x86\rv40dsp.asm" />
@@ -900,6 +901,7 @@
     <ClCompile Include="..\libavcodec\mpeg12enc.c">
     </ClCompile>
     <ClCompile Include="..\libavcodec\xvididct.c">
+      <ObjectFileName>$(IntDir)\libavcodec_xvididct.obj</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\libavcodec\mpl2dec.c">
     </ClCompile>
@@ -1633,8 +1635,6 @@
     </ClCompile>
     <ClCompile Include="..\libavcodec\x86\xvididct_mmx.c">
     </ClCompile>
-    <ClCompile Include="..\libavcodec\x86\xvididct_sse2.c">
-    </ClCompile>
     <ClCompile Include="..\libavcodec\x86\snowdsp.c">
     </ClCompile>
     <ClCompile Include="..\libavcodec\x86\vc1dsp_mmx.c">

SMP/libavcodec.vcxproj.filters

@@ -171,6 +171,9 @@
     <YASM Include="..\libavcodec\x86\mlpdsp.asm">
       <Filter>Source Files\libavcodec\x86</Filter>
     </YASM>
+    <YASM Include="..\libavcodec\x86\xvididct.asm">
+      <Filter>Source Files\libavcodec\x86</Filter>
+    </YASM>
     <YASM Include="..\libavcodec\x86\proresdsp.asm">
       <Filter>Source Files\libavcodec\x86</Filter>
     </YASM>
@@ -2420,9 +2423,6 @@
     <ClCompile Include="..\libavcodec\x86\xvididct_mmx.c">
       <Filter>Source Files\libavcodec\x86</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\x86\xvididct_sse2.c">
-      <Filter>Source Files\libavcodec\x86</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavcodec\x86\snowdsp.c">
       <Filter>Source Files\libavcodec\x86</Filter>
     </ClCompile>