projects: Update for recent upstream merge.

SMP/config.asm

@@ -922,6 +922,7 @@
 %define CONFIG_GSM_MS_DECODER 1
 %define CONFIG_IAC_DECODER 1
 %define CONFIG_IMC_DECODER 1
+%define CONFIG_INTERPLAY_ACM_DECODER 1
 %define CONFIG_MACE3_DECODER 1
 %define CONFIG_MACE6_DECODER 1
 %define CONFIG_METASOUND_DECODER 1
@@ -1084,6 +1085,7 @@
 %define CONFIG_AA_DEMUXER 1
 %define CONFIG_AAC_DEMUXER 1
 %define CONFIG_AC3_DEMUXER 1
+%define CONFIG_ACM_DEMUXER 1
 %define CONFIG_ACT_DEMUXER 1
 %define CONFIG_ADF_DEMUXER 1
 %define CONFIG_ADP_DEMUXER 1

SMP/config.h

@@ -972,6 +972,7 @@
 #define CONFIG_GSM_MS_DECODER 1
 #define CONFIG_IAC_DECODER 1
 #define CONFIG_IMC_DECODER 1
+#define CONFIG_INTERPLAY_ACM_DECODER 1
 #define CONFIG_MACE3_DECODER 1
 #define CONFIG_MACE6_DECODER 1
 #define CONFIG_METASOUND_DECODER 1
@@ -1134,6 +1135,7 @@
 #define CONFIG_AA_DEMUXER 1
 #define CONFIG_AAC_DEMUXER 1
 #define CONFIG_AC3_DEMUXER 1
+#define CONFIG_ACM_DEMUXER 1
 #define CONFIG_ACT_DEMUXER 1
 #define CONFIG_ADF_DEMUXER 1
 #define CONFIG_ADP_DEMUXER 1

SMP/libavcodec.vcxproj

@@ -575,6 +575,7 @@
     <ClCompile Include="..\libavcodec\indeo4.c" />
     <ClCompile Include="..\libavcodec\ivi.c" />
     <ClCompile Include="..\libavcodec\indeo5.c" />
+    <ClCompile Include="..\libavcodec\interplayacm.c" />
     <ClCompile Include="..\libavcodec\dpcm.c" />
     <ClCompile Include="..\libavcodec\interplayvideo.c" />
     <ClCompile Include="..\libavcodec\jacosubdec.c" />

SMP/libavcodec.vcxproj.filters

@@ -1395,6 +1395,9 @@
     <ClCompile Include="..\libavcodec\indeo5.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\interplayacm.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\dpcm.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>

SMP/libavformat.vcxproj

@@ -127,6 +127,7 @@
     <ClCompile Include="..\libavformat\img2.c" />
     <ClCompile Include="..\libavformat\rawdec.c" />
     <ClCompile Include="..\libavformat\ac3dec.c" />
+    <ClCompile Include="..\libavformat\acm.c" />
     <ClCompile Include="..\libavformat\act.c" />
     <ClCompile Include="..\libavformat\bintext.c" />
     <ClCompile Include="..\libavformat\sauce.c" />

SMP/libavformat.vcxproj.filters

@@ -202,6 +202,9 @@
     <ClCompile Include="..\libavformat\ac3dec.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\acm.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\act.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>