projects: Update for recent upstream merge.

SMP/config.asm

@@ -665,6 +665,7 @@
 %define CONFIG_VP3DSP 1
 %define CONFIG_VP56DSP 1
 %define CONFIG_VP8DSP 1
+%define CONFIG_VT_BT2020 0
 %define CONFIG_WMA_FREQS 1
 %define CONFIG_WMV2DSP 1
 %define CONFIG_AAC_ADTSTOASC_BSF 1
@@ -783,6 +784,7 @@
 %define CONFIG_KMVC_DECODER 1
 %define CONFIG_LAGARITH_DECODER 1
 %define CONFIG_LOCO_DECODER 1
+%define CONFIG_M101_DECODER 1
 %define CONFIG_MDEC_DECODER 1
 %define CONFIG_MIMIC_DECODER 1
 %define CONFIG_MJPEG_DECODER 1
@@ -1362,6 +1364,7 @@
 %define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 1
 %define CONFIG_WEBVTT_DEMUXER 1
 %define CONFIG_WSAUD_DEMUXER 1
+%define CONFIG_WSD_DEMUXER 1
 %define CONFIG_WSVQA_DEMUXER 1
 %define CONFIG_WTV_DEMUXER 1
 %define CONFIG_WVE_DEMUXER 1

SMP/config.h

@@ -715,6 +715,7 @@
 #define CONFIG_VP3DSP 1
 #define CONFIG_VP56DSP 1
 #define CONFIG_VP8DSP 1
+#define CONFIG_VT_BT2020 0
 #define CONFIG_WMA_FREQS 1
 #define CONFIG_WMV2DSP 1
 #define CONFIG_AAC_ADTSTOASC_BSF 1
@@ -833,6 +834,7 @@
 #define CONFIG_KMVC_DECODER 1
 #define CONFIG_LAGARITH_DECODER 1
 #define CONFIG_LOCO_DECODER 1
+#define CONFIG_M101_DECODER 1
 #define CONFIG_MDEC_DECODER 1
 #define CONFIG_MIMIC_DECODER 1
 #define CONFIG_MJPEG_DECODER 1
@@ -1412,6 +1414,7 @@
 #define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 1
 #define CONFIG_WEBVTT_DEMUXER 1
 #define CONFIG_WSAUD_DEMUXER 1
+#define CONFIG_WSD_DEMUXER 1
 #define CONFIG_WSVQA_DEMUXER 1
 #define CONFIG_WTV_DEMUXER 1
 #define CONFIG_WVE_DEMUXER 1

SMP/libavcodec.vcxproj

@@ -443,6 +443,7 @@
     <ClCompile Include="..\libavcodec\dcadec.c" />
     <ClCompile Include="..\libavcodec\dca.c" />
     <ClCompile Include="..\libavcodec\dcadata.c" />
+    <ClCompile Include="..\libavcodec\dcahuff.c" />
     <ClCompile Include="..\libavcodec\dca_core.c" />
     <ClCompile Include="..\libavcodec\dca_exss.c" />
     <ClCompile Include="..\libavcodec\dca_xll.c" />
@@ -621,6 +622,7 @@
     <ClCompile Include="..\libavcodec\lagarithrac.c" />
     <ClCompile Include="..\libavcodec\ljpegenc.c" />
     <ClCompile Include="..\libavcodec\loco.c" />
+    <ClCompile Include="..\libavcodec\m101.c" />
     <ClCompile Include="..\libavcodec\mace.c" />
     <ClCompile Include="..\libavcodec\mdec.c" />
     <ClCompile Include="..\libavcodec\metasound.c" />

SMP/libavcodec.vcxproj.filters

@@ -1011,6 +1011,9 @@
     <ClCompile Include="..\libavcodec\dcadata.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\dcahuff.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\dca_core.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -1509,6 +1512,9 @@
     <ClCompile Include="..\libavcodec\loco.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\m101.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\mace.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>

SMP/libavformat.vcxproj

@@ -383,6 +383,7 @@
     <ClCompile Include="..\libavformat\rtpenc_jpeg.c" />
     <ClCompile Include="..\libavformat\rtpenc_mpv.c" />
     <ClCompile Include="..\libavformat\rtpenc.c" />
+    <ClCompile Include="..\libavformat\rtpenc_vc2hq.c" />
     <ClCompile Include="..\libavformat\rtpenc_vp8.c" />
     <ClCompile Include="..\libavformat\rtpenc_xiph.c" />
     <ClCompile Include="..\libavformat\rtsp.c" />
@@ -451,6 +452,7 @@
     <ClCompile Include="..\libavformat\webvttdec.c" />
     <ClCompile Include="..\libavformat\webvttenc.c" />
     <ClCompile Include="..\libavformat\westwood_aud.c" />
+    <ClCompile Include="..\libavformat\wsddec.c" />
     <ClCompile Include="..\libavformat\westwood_vqa.c" />
     <ClCompile Include="..\libavformat\wtvdec.c" />
     <ClCompile Include="..\libavformat\wtv_common.c" />

SMP/libavformat.vcxproj.filters

@@ -970,6 +970,9 @@
     <ClCompile Include="..\libavformat\rtpenc.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\rtpenc_vc2hq.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\rtpenc_vp8.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
@@ -1174,6 +1177,9 @@
     <ClCompile Include="..\libavformat\westwood_aud.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\wsddec.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\westwood_vqa.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>