projects: Update for recent upstream merge.

SMP/config.asm

@@ -633,7 +633,7 @@
 %define CONFIG_HUFFYUVENCDSP 1
 %define CONFIG_IDCTDSP 1
 %define CONFIG_IIRFILTER 1
-%define CONFIG_IMDCT15 1
+%define CONFIG_MDCT15 1
 %define CONFIG_INTRAX8 1
 %define CONFIG_ISO_MEDIA 1
 %define CONFIG_IVIDSP 1
@@ -758,6 +758,7 @@
 %define CONFIG_FLASHSV2_DECODER 1
 %define CONFIG_FLIC_DECODER 1
 %define CONFIG_FLV_DECODER 1
+%define CONFIG_FMVC_DECODER 1
 %define CONFIG_FOURXM_DECODER 1
 %define CONFIG_FRAPS_DECODER 1
 %define CONFIG_FRWU_DECODER 1
@@ -1535,6 +1536,7 @@
 %define CONFIG_MP2_ENCODER 1
 %define CONFIG_MP2FIXED_ENCODER 1
 %define CONFIG_NELLYMOSER_ENCODER 1
+%define CONFIG_OPUS_ENCODER 1
 %define CONFIG_RA_144_ENCODER 1
 %define CONFIG_SONIC_ENCODER 1
 %define CONFIG_SONIC_LS_ENCODER 1

SMP/config.h

@@ -688,7 +688,7 @@
 #define CONFIG_HUFFYUVENCDSP 1
 #define CONFIG_IDCTDSP 1
 #define CONFIG_IIRFILTER 1
-#define CONFIG_IMDCT15 1
+#define CONFIG_MDCT15 1
 #define CONFIG_INTRAX8 1
 #define CONFIG_ISO_MEDIA 1
 #define CONFIG_IVIDSP 1
@@ -813,6 +813,7 @@
 #define CONFIG_FLASHSV2_DECODER 1
 #define CONFIG_FLIC_DECODER 1
 #define CONFIG_FLV_DECODER 1
+#define CONFIG_FMVC_DECODER 1
 #define CONFIG_FOURXM_DECODER 1
 #define CONFIG_FRAPS_DECODER 1
 #define CONFIG_FRWU_DECODER 1
@@ -1590,6 +1591,7 @@
 #define CONFIG_MP2_ENCODER 1
 #define CONFIG_MP2FIXED_ENCODER 1
 #define CONFIG_NELLYMOSER_ENCODER 1
+#define CONFIG_OPUS_ENCODER 1
 #define CONFIG_RA_144_ENCODER 1
 #define CONFIG_SONIC_ENCODER 1
 #define CONFIG_SONIC_LS_ENCODER 1

SMP/libavcodec.vcxproj

@@ -216,7 +216,7 @@
     <ClCompile Include="..\libavcodec\simple_idct.c" />
     <ClCompile Include="..\libavcodec\jrevdct.c" />
     <ClCompile Include="..\libavcodec\iirfilter.c" />
-    <ClCompile Include="..\libavcodec\imdct15.c" />
+    <ClCompile Include="..\libavcodec\mdct15.c" />
     <ClCompile Include="..\libavcodec\intrax8.c" />
     <ClCompile Include="..\libavcodec\intrax8dsp.c" />
     <ClCompile Include="..\libavcodec\ivi_dsp.c" />
@@ -449,6 +449,7 @@
     <ClCompile Include="..\libavcodec\flashsvenc.c" />
     <ClCompile Include="..\libavcodec\flashsv2enc.c" />
     <ClCompile Include="..\libavcodec\flicvideo.c" />
+    <ClCompile Include="..\libavcodec\fmvc.c" />
     <ClCompile Include="..\libavcodec\4xm.c" />
     <ClCompile Include="..\libavcodec\fraps.c" />
     <ClCompile Include="..\libavcodec\frwu.c" />
@@ -608,8 +609,10 @@
     <ClCompile Include="..\libavcodec\opus.c" />
     <ClCompile Include="..\libavcodec\opus_celt.c" />
     <ClCompile Include="..\libavcodec\opus_rc.c" />
+    <ClCompile Include="..\libavcodec\opus_pvq.c" />
     <ClCompile Include="..\libavcodec\opus_silk.c" />
     <ClCompile Include="..\libavcodec\opustab.c" />
+    <ClCompile Include="..\libavcodec\opusenc.c" />
     <ClCompile Include="..\libavcodec\pafaudio.c" />
     <ClCompile Include="..\libavcodec\pafvideo.c" />
     <ClCompile Include="..\libavcodec\pnmdec.c" />

SMP/libavcodec.vcxproj.filters

@@ -471,7 +471,7 @@
     <ClCompile Include="..\libavcodec\iirfilter.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\imdct15.c">
+    <ClCompile Include="..\libavcodec\mdct15.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
     <ClCompile Include="..\libavcodec\intrax8.c">
@@ -1170,6 +1170,9 @@
     <ClCompile Include="..\libavcodec\flicvideo.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\fmvc.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\4xm.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -1647,12 +1650,18 @@
     <ClCompile Include="..\libavcodec\opus_rc.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\opus_pvq.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\opus_silk.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
     <ClCompile Include="..\libavcodec\opustab.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\opusenc.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\pafaudio.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>