projects: Update for recent upstream merge.

SMP/config.asm

@@ -1494,6 +1494,7 @@
 %define CONFIG_CODECVIEW_FILTER 1
 %define CONFIG_COLORBALANCE_FILTER 1
 %define CONFIG_COLORCHANNELMIXER_FILTER 1
+%define CONFIG_COLORKEY_FILTER 1
 %define CONFIG_COLORLEVELS_FILTER 1
 %define CONFIG_COLORMATRIX_FILTER 1
 %define CONFIG_COPY_FILTER 1

SMP/config.h

@@ -1541,6 +1541,7 @@
 #define CONFIG_CODECVIEW_FILTER 1
 #define CONFIG_COLORBALANCE_FILTER 1
 #define CONFIG_COLORCHANNELMIXER_FILTER 1
+#define CONFIG_COLORKEY_FILTER 1
 #define CONFIG_COLORLEVELS_FILTER 1
 #define CONFIG_COLORMATRIX_FILTER 1
 #define CONFIG_COPY_FILTER 1

SMP/libavcodec.vcxproj

@@ -108,6 +108,7 @@
     <YASM Include="..\libavcodec\x86\hevc_idct.asm" />
     <YASM Include="..\libavcodec\x86\hevc_res_add.asm" />
     <YASM Include="..\libavcodec\x86\hevc_sao.asm" />
+    <YASM Include="..\libavcodec\x86\jpeg2000dsp.asm" />
     <YASM Include="..\libavcodec\x86\mlpdsp.asm" />
     <YASM Include="..\libavcodec\x86\xvididct.asm" />
     <YASM Include="..\libavcodec\x86\proresdsp.asm" />
@@ -858,6 +859,7 @@
     <ClCompile Include="..\libavcodec\jpeg2000dec.c">
     </ClCompile>
     <ClCompile Include="..\libavcodec\jpeg2000dsp.c">
+      <ObjectFileName>$(IntDir)\libavcodec_jpeg2000dsp.obj</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\libavcodec\mqcdec.c">
     </ClCompile>
@@ -1631,6 +1633,8 @@
     </ClCompile>
     <ClCompile Include="..\libavcodec\x86\hevcdsp_init.c">
     </ClCompile>
+    <ClCompile Include="..\libavcodec\x86\jpeg2000dsp_init.c">
+    </ClCompile>
     <ClCompile Include="..\libavcodec\x86\mlpdsp_init.c">
     </ClCompile>
     <ClCompile Include="..\libavcodec\x86\xvididct_init.c">

SMP/libavcodec.vcxproj.filters

@@ -168,6 +168,9 @@
     <YASM Include="..\libavcodec\x86\hevc_sao.asm">
       <Filter>Source Files\libavcodec\x86</Filter>
     </YASM>
+    <YASM Include="..\libavcodec\x86\jpeg2000dsp.asm">
+      <Filter>Source Files\libavcodec\x86</Filter>
+    </YASM>
     <YASM Include="..\libavcodec\x86\mlpdsp.asm">
       <Filter>Source Files\libavcodec\x86</Filter>
     </YASM>
@@ -2420,6 +2423,9 @@
     <ClCompile Include="..\libavcodec\x86\hevcdsp_init.c">
       <Filter>Source Files\libavcodec\x86</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\x86\jpeg2000dsp_init.c">
+      <Filter>Source Files\libavcodec\x86</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\x86\mlpdsp_init.c">
       <Filter>Source Files\libavcodec\x86</Filter>
     </ClCompile>

SMP/libavfilter.vcxproj

@@ -223,6 +223,8 @@
     </ClCompile>
     <ClCompile Include="..\libavfilter\vf_colorchannelmixer.c">
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_colorkey.c">
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_colorlevels.c">
     </ClCompile>
     <ClCompile Include="..\libavfilter\vf_colormatrix.c">

SMP/libavfilter.vcxproj.filters

@@ -281,6 +281,9 @@
     <ClCompile Include="..\libavfilter\vf_colorchannelmixer.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_colorkey.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_colorlevels.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>