projects: Update for recent upstream merge.

SMP/config.asm

@@ -1421,6 +1421,7 @@
 %define CONFIG_V308_ENCODER 1
 %define CONFIG_V408_ENCODER 1
 %define CONFIG_V410_ENCODER 1
+%define CONFIG_VC2_ENCODER 1
 %define CONFIG_WRAPPED_AVFRAME_ENCODER 1
 %define CONFIG_WMV1_ENCODER 1
 %define CONFIG_WMV2_ENCODER 1
@@ -1545,6 +1546,7 @@
 %define CONFIG_ALIMITER_FILTER 1
 %define CONFIG_ALLPASS_FILTER 1
 %define CONFIG_AMERGE_FILTER 1
+%define CONFIG_AMETADATA_FILTER 1
 %define CONFIG_AMIX_FILTER 1
 %define CONFIG_ANEQUALIZER_FILTER 1
 %define CONFIG_ANULL_FILTER 1
@@ -1690,6 +1692,7 @@
 %define CONFIG_MASKEDMERGE_FILTER 1
 %define CONFIG_MCDEINT_FILTER 1
 %define CONFIG_MERGEPLANES_FILTER 1
+%define CONFIG_METADATA_FILTER 1
 %define CONFIG_MPDECIMATE_FILTER 1
 %define CONFIG_NEGATE_FILTER 1
 %define CONFIG_NNEDI_FILTER 1
@@ -1744,6 +1747,7 @@
 %define CONFIG_STREAMSELECT_FILTER 1
 %define CONFIG_SUBTITLES_FILTER 1
 %define CONFIG_SUPER2XSAI_FILTER 1
+%define CONFIG_SWAPRECT_FILTER 1
 %define CONFIG_SWAPUV_FILTER 1
 %define CONFIG_TBLEND_FILTER 1
 %define CONFIG_TELECINE_FILTER 1

SMP/config.h

@@ -1471,6 +1471,7 @@
 #define CONFIG_V308_ENCODER 1
 #define CONFIG_V408_ENCODER 1
 #define CONFIG_V410_ENCODER 1
+#define CONFIG_VC2_ENCODER 1
 #define CONFIG_WRAPPED_AVFRAME_ENCODER 1
 #define CONFIG_WMV1_ENCODER 1
 #define CONFIG_WMV2_ENCODER 1
@@ -1595,6 +1596,7 @@
 #define CONFIG_ALIMITER_FILTER 1
 #define CONFIG_ALLPASS_FILTER 1
 #define CONFIG_AMERGE_FILTER 1
+#define CONFIG_AMETADATA_FILTER 1
 #define CONFIG_AMIX_FILTER 1
 #define CONFIG_ANEQUALIZER_FILTER 1
 #define CONFIG_ANULL_FILTER 1
@@ -1740,6 +1742,7 @@
 #define CONFIG_MASKEDMERGE_FILTER 1
 #define CONFIG_MCDEINT_FILTER 1
 #define CONFIG_MERGEPLANES_FILTER 1
+#define CONFIG_METADATA_FILTER 1
 #define CONFIG_MPDECIMATE_FILTER 1
 #define CONFIG_NEGATE_FILTER 1
 #define CONFIG_NNEDI_FILTER 1
@@ -1794,6 +1797,7 @@
 #define CONFIG_STREAMSELECT_FILTER 1
 #define CONFIG_SUBTITLES_FILTER 1
 #define CONFIG_SUPER2XSAI_FILTER 1
+#define CONFIG_SWAPRECT_FILTER 1
 #define CONFIG_SWAPUV_FILTER 1
 #define CONFIG_TBLEND_FILTER 1
 #define CONFIG_TELECINE_FILTER 1

SMP/libavcodec.vcxproj

@@ -810,6 +810,8 @@
       <ObjectFileName>$(IntDir)\libavcodec_vc1dsp.obj</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\libavcodec\qsvdec_vc1.c" />
+    <ClCompile Include="..\libavcodec\vc2enc.c" />
+    <ClCompile Include="..\libavcodec\vc2enc_dwt.c" />
     <ClCompile Include="..\libavcodec\vcr1.c" />
     <ClCompile Include="..\libavcodec\vmdaudio.c" />
     <ClCompile Include="..\libavcodec\vmdvideo.c" />

SMP/libavcodec.vcxproj.filters

@@ -2022,6 +2022,12 @@
     <ClCompile Include="..\libavcodec\qsvdec_vc1.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\vc2enc.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavcodec\vc2enc_dwt.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\vcr1.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>

SMP/libavfilter.vcxproj

@@ -119,6 +119,7 @@
     <ClCompile Include="..\libavfilter\af_alimiter.c" />
     <ClCompile Include="..\libavfilter\af_biquads.c" />
     <ClCompile Include="..\libavfilter\af_amerge.c" />
+    <ClCompile Include="..\libavfilter\f_metadata.c" />
     <ClCompile Include="..\libavfilter\af_amix.c" />
     <ClCompile Include="..\libavfilter\af_anull.c" />
     <ClCompile Include="..\libavfilter\af_apad.c" />
@@ -306,6 +307,7 @@
       <ObjectFileName>$(IntDir)\libavfilter_vf_stereo3d.obj</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\libavfilter\vf_super2xsai.c" />
+    <ClCompile Include="..\libavfilter\vf_swaprect.c" />
     <ClCompile Include="..\libavfilter\vf_swapuv.c" />
     <ClCompile Include="..\libavfilter\vf_telecine.c" />
     <ClCompile Include="..\libavfilter\vf_thumbnail.c" />

SMP/libavfilter.vcxproj.filters

@@ -177,6 +177,9 @@
     <ClCompile Include="..\libavfilter\af_amerge.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\f_metadata.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\af_amix.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -654,6 +657,9 @@
     <ClCompile Include="..\libavfilter\vf_super2xsai.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_swaprect.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_swapuv.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>