projects: Update for recent upstream merge.

SMP/config.asm

@@ -383,6 +383,7 @@
 %define HAVE_DOS_PATHS 1
 %define HAVE_DXVA2API_COBJ 1
 %define HAVE_DXVA2_LIB 1
+%define HAVE_WINRT 0
 %define HAVE_LIBC_MSVCRT 1
 %define HAVE_LIBDC1394_1 0
 %define HAVE_LIBDC1394_2 0
@@ -1020,6 +1021,7 @@
 %define CONFIG_ADPCM_IMA_WAV_DECODER 1
 %define CONFIG_ADPCM_IMA_WS_DECODER 1
 %define CONFIG_ADPCM_MS_DECODER 1
+%define CONFIG_ADPCM_PSX_DECODER 1
 %define CONFIG_ADPCM_SBPRO_2_DECODER 1
 %define CONFIG_ADPCM_SBPRO_3_DECODER 1
 %define CONFIG_ADPCM_SBPRO_4_DECODER 1
@@ -1078,6 +1080,7 @@
 %define CONFIG_ACT_DEMUXER 1
 %define CONFIG_ADF_DEMUXER 1
 %define CONFIG_ADP_DEMUXER 1
+%define CONFIG_ADS_DEMUXER 1
 %define CONFIG_ADX_DEMUXER 1
 %define CONFIG_AEA_DEMUXER 1
 %define CONFIG_AFC_DEMUXER 1
@@ -1142,6 +1145,7 @@
 %define CONFIG_G722_DEMUXER 1
 %define CONFIG_G723_1_DEMUXER 1
 %define CONFIG_G729_DEMUXER 1
+%define CONFIG_GENH_DEMUXER 1
 %define CONFIG_GIF_DEMUXER 1
 %define CONFIG_GSM_DEMUXER 1
 %define CONFIG_GXF_DEMUXER 1
@@ -1265,6 +1269,7 @@
 %define CONFIG_SUBVIEWER1_DEMUXER 1
 %define CONFIG_SUBVIEWER_DEMUXER 1
 %define CONFIG_SUP_DEMUXER 1
+%define CONFIG_SVAG_DEMUXER 1
 %define CONFIG_SWF_DEMUXER 1
 %define CONFIG_TAK_DEMUXER 1
 %define CONFIG_TEDCAPTIONS_DEMUXER 1
@@ -1275,6 +1280,7 @@
 %define CONFIG_TTA_DEMUXER 1
 %define CONFIG_TXD_DEMUXER 1
 %define CONFIG_TTY_DEMUXER 1
+%define CONFIG_VAG_DEMUXER 1
 %define CONFIG_VC1_DEMUXER 1
 %define CONFIG_VC1T_DEMUXER 1
 %define CONFIG_VIVO_DEMUXER 1

SMP/config.h

@@ -425,6 +425,7 @@
 #define HAVE_DOS_PATHS 1
 #define HAVE_DXVA2API_COBJ 1
 #define HAVE_DXVA2_LIB 1
+#define HAVE_WINRT 0
 #define HAVE_LIBC_MSVCRT 1
 #define HAVE_LIBDC1394_1 0
 #define HAVE_LIBDC1394_2 0
@@ -1070,6 +1071,7 @@
 #define CONFIG_ADPCM_IMA_WAV_DECODER 1
 #define CONFIG_ADPCM_IMA_WS_DECODER 1
 #define CONFIG_ADPCM_MS_DECODER 1
+#define CONFIG_ADPCM_PSX_DECODER 1
 #define CONFIG_ADPCM_SBPRO_2_DECODER 1
 #define CONFIG_ADPCM_SBPRO_3_DECODER 1
 #define CONFIG_ADPCM_SBPRO_4_DECODER 1
@@ -1128,6 +1130,7 @@
 #define CONFIG_ACT_DEMUXER 1
 #define CONFIG_ADF_DEMUXER 1
 #define CONFIG_ADP_DEMUXER 1
+#define CONFIG_ADS_DEMUXER 1
 #define CONFIG_ADX_DEMUXER 1
 #define CONFIG_AEA_DEMUXER 1
 #define CONFIG_AFC_DEMUXER 1
@@ -1192,6 +1195,7 @@
 #define CONFIG_G722_DEMUXER 1
 #define CONFIG_G723_1_DEMUXER 1
 #define CONFIG_G729_DEMUXER 1
+#define CONFIG_GENH_DEMUXER 1
 #define CONFIG_GIF_DEMUXER 1
 #define CONFIG_GSM_DEMUXER 1
 #define CONFIG_GXF_DEMUXER 1
@@ -1315,6 +1319,7 @@
 #define CONFIG_SUBVIEWER1_DEMUXER 1
 #define CONFIG_SUBVIEWER_DEMUXER 1
 #define CONFIG_SUP_DEMUXER 1
+#define CONFIG_SVAG_DEMUXER 1
 #define CONFIG_SWF_DEMUXER 1
 #define CONFIG_TAK_DEMUXER 1
 #define CONFIG_TEDCAPTIONS_DEMUXER 1
@@ -1325,6 +1330,7 @@
 #define CONFIG_TTA_DEMUXER 1
 #define CONFIG_TXD_DEMUXER 1
 #define CONFIG_TTY_DEMUXER 1
+#define CONFIG_VAG_DEMUXER 1
 #define CONFIG_VC1_DEMUXER 1
 #define CONFIG_VC1T_DEMUXER 1
 #define CONFIG_VIVO_DEMUXER 1

SMP/libavcodec.vcxproj

@@ -445,6 +445,8 @@
     </ClCompile>
     <ClCompile Include="..\libavcodec\aacenc_tns.c">
     </ClCompile>
+    <ClCompile Include="..\libavcodec\aacenc_ltp.c">
+    </ClCompile>
     <ClCompile Include="..\libavcodec\aacenc_pred.c">
     </ClCompile>
     <ClCompile Include="..\libavcodec\psymodel.c">

SMP/libavcodec.vcxproj.filters

@@ -683,6 +683,9 @@
     <ClCompile Include="..\libavcodec\aacenc_tns.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\aacenc_ltp.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\aacenc_pred.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>

SMP/libavformat.vcxproj

@@ -183,6 +183,8 @@
     </ClCompile>
     <ClCompile Include="..\libavformat\adp.c">
     </ClCompile>
+    <ClCompile Include="..\libavformat\ads.c">
+    </ClCompile>
     <ClCompile Include="..\libavformat\adxdec.c">
     </ClCompile>
     <ClCompile Include="..\libavformat\adtsenc.c">
@@ -397,6 +399,8 @@
     </ClCompile>
     <ClCompile Include="..\libavformat\g729dec.c">
     </ClCompile>
+    <ClCompile Include="..\libavformat\genh.c">
+    </ClCompile>
     <ClCompile Include="..\libavformat\h261dec.c">
     </ClCompile>
     <ClCompile Include="..\libavformat\h263dec.c">
@@ -729,6 +733,8 @@
     </ClCompile>
     <ClCompile Include="..\libavformat\supdec.c">
     </ClCompile>
+    <ClCompile Include="..\libavformat\svag.c">
+    </ClCompile>
     <ClCompile Include="..\libavformat\swfdec.c">
     </ClCompile>
     <ClCompile Include="..\libavformat\takdec.c">
@@ -753,6 +759,8 @@
     </ClCompile>
     <ClCompile Include="..\libavformat\uncodedframecrcenc.c">
     </ClCompile>
+    <ClCompile Include="..\libavformat\vag.c">
+    </ClCompile>
     <ClCompile Include="..\libavformat\vc1dec.c">
     </ClCompile>
     <ClCompile Include="..\libavformat\vc1test.c">

SMP/libavformat.vcxproj.filters

@@ -204,6 +204,9 @@
     <ClCompile Include="..\libavformat\adp.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\ads.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\adxdec.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
@@ -525,6 +528,9 @@
     <ClCompile Include="..\libavformat\g729dec.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\genh.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\h261dec.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
@@ -1023,6 +1029,9 @@
     <ClCompile Include="..\libavformat\supdec.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\svag.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\swfdec.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
@@ -1059,6 +1068,9 @@
     <ClCompile Include="..\libavformat\uncodedframecrcenc.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\vag.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\vc1dec.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>