projects: Update for recent upstream merge.

SMP/config.asm

@@ -453,7 +453,6 @@
 %define CONFIG_GNUTLS 1
 %define CONFIG_ICONV 1
 %define CONFIG_LADSPA 0
-%define CONFIG_LIBAACPLUS 0
 %define CONFIG_LIBASS 1
 %define CONFIG_LIBBLURAY 1
 %define CONFIG_LIBBS2B 0
@@ -499,7 +498,6 @@
 %define CONFIG_LIBUTVIDEO 0
 %define CONFIG_LIBV4L2 0
 %define CONFIG_LIBVIDSTAB 0
-%define CONFIG_LIBVO_AACENC 0
 %define CONFIG_LIBVO_AMRWBENC 0
 %define CONFIG_LIBVORBIS 1
 %define CONFIG_LIBVPX 1
@@ -695,6 +693,7 @@
 %define CONFIG_CAVS_DECODER 1
 %define CONFIG_CDGRAPHICS_DECODER 1
 %define CONFIG_CDXL_DECODER 1
+%define CONFIG_CFHD_DECODER 1
 %define CONFIG_CINEPAK_DECODER 1
 %define CONFIG_CLJR_DECODER 1
 %define CONFIG_CLLC_DECODER 1
@@ -1511,7 +1510,6 @@
 %define CONFIG_LIBTHEORA_ENCODER 1
 %define CONFIG_LIBTWOLAME_ENCODER 0
 %define CONFIG_LIBUTVIDEO_ENCODER 0
-%define CONFIG_LIBVO_AACENC_ENCODER 0
 %define CONFIG_LIBVO_AMRWBENC_ENCODER 0
 %define CONFIG_LIBVORBIS_ENCODER 1
 %define CONFIG_LIBVPX_VP8_ENCODER 1
@@ -1525,7 +1523,6 @@
 %define CONFIG_LIBX265_ENCODER 1
 %define CONFIG_LIBXAVS_ENCODER 0
 %define CONFIG_LIBXVID_ENCODER 1
-%define CONFIG_LIBAACPLUS_ENCODER 0
 %define CONFIG_LIBOPENH264_ENCODER 0
 %define CONFIG_H264_QSV_ENCODER 1
 %define CONFIG_NVENC_ENCODER 1

SMP/config.h

@@ -495,7 +495,6 @@
 #define CONFIG_GNUTLS 1
 #define CONFIG_ICONV 1
 #define CONFIG_LADSPA 0
-#define CONFIG_LIBAACPLUS 0
 #define CONFIG_LIBASS 1
 #define CONFIG_LIBBLURAY 1
 #define CONFIG_LIBBS2B 0
@@ -541,7 +540,6 @@
 #define CONFIG_LIBUTVIDEO 0
 #define CONFIG_LIBV4L2 0
 #define CONFIG_LIBVIDSTAB 0
-#define CONFIG_LIBVO_AACENC 0
 #define CONFIG_LIBVO_AMRWBENC 0
 #define CONFIG_LIBVORBIS 1
 #define CONFIG_LIBVPX 1
@@ -745,6 +743,7 @@
 #define CONFIG_CAVS_DECODER 1
 #define CONFIG_CDGRAPHICS_DECODER 1
 #define CONFIG_CDXL_DECODER 1
+#define CONFIG_CFHD_DECODER 1
 #define CONFIG_CINEPAK_DECODER 1
 #define CONFIG_CLJR_DECODER 1
 #define CONFIG_CLLC_DECODER 1
@@ -1561,7 +1560,6 @@
 #define CONFIG_LIBTHEORA_ENCODER 1
 #define CONFIG_LIBTWOLAME_ENCODER 0
 #define CONFIG_LIBUTVIDEO_ENCODER 0
-#define CONFIG_LIBVO_AACENC_ENCODER 0
 #define CONFIG_LIBVO_AMRWBENC_ENCODER 0
 #define CONFIG_LIBVORBIS_ENCODER 1
 #define CONFIG_LIBVPX_VP8_ENCODER 1
@@ -1575,7 +1573,6 @@
 #define CONFIG_LIBX265_ENCODER 1
 #define CONFIG_LIBXAVS_ENCODER 0
 #define CONFIG_LIBXVID_ENCODER 1
-#define CONFIG_LIBAACPLUS_ENCODER 0
 #define CONFIG_LIBOPENH264_ENCODER 0
 #define CONFIG_H264_QSV_ENCODER 1
 #define CONFIG_NVENC_ENCODER 1

SMP/libavcodec.vcxproj

@@ -113,7 +113,6 @@
     <YASM Include="..\libavcodec\x86\g722dsp.asm" />
     <YASM Include="..\libavcodec\x86\alacdsp.asm" />
     <YASM Include="..\libavcodec\x86\pngdsp.asm" />
-    <YASM Include="..\libavcodec\x86\dcadsp.asm" />
     <YASM Include="..\libavcodec\x86\synth_filter.asm" />
     <YASM Include="..\libavcodec\x86\diracdsp_yasm.asm" />
     <YASM Include="..\libavcodec\x86\dwt_yasm.asm" />
@@ -421,6 +420,8 @@
     <ClCompile Include="..\libavcodec\ccaption_dec.c" />
     <ClCompile Include="..\libavcodec\cdgraphics.c" />
     <ClCompile Include="..\libavcodec\cdxl.c" />
+    <ClCompile Include="..\libavcodec\cfhd.c" />
+    <ClCompile Include="..\libavcodec\cfhddata.c" />
     <ClCompile Include="..\libavcodec\cinepak.c" />
     <ClCompile Include="..\libavcodec\cinepakenc.c" />
     <ClCompile Include="..\libavcodec\cljrdec.c" />
@@ -434,12 +435,12 @@
     <ClCompile Include="..\libavcodec\cscd.c" />
     <ClCompile Include="..\libavcodec\dcadec.c" />
     <ClCompile Include="..\libavcodec\dca.c" />
-    <ClCompile Include="..\libavcodec\dcadsp.c">
-      <ObjectFileName>$(IntDir)\libavcodec_dcadsp.obj</ObjectFileName>
-    </ClCompile>
     <ClCompile Include="..\libavcodec\dcadata.c" />
+    <ClCompile Include="..\libavcodec\dca_core.c" />
     <ClCompile Include="..\libavcodec\dca_exss.c" />
     <ClCompile Include="..\libavcodec\dca_xll.c" />
+    <ClCompile Include="..\libavcodec\dcadsp.c" />
+    <ClCompile Include="..\libavcodec\dcadct.c" />
     <ClCompile Include="..\libavcodec\synth_filter.c">
       <ObjectFileName>$(IntDir)\libavcodec_synth_filter.obj</ObjectFileName>
     </ClCompile>
@@ -1010,7 +1011,6 @@
     <ClCompile Include="..\libavcodec\x86\cavsdsp.c">
       <ObjectFileName>$(IntDir)\libavcodec_x86_cavsdsp.obj</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\x86\dcadsp_init.c" />
     <ClCompile Include="..\libavcodec\x86\synth_filter_init.c" />
     <ClCompile Include="..\libavcodec\x86\dnxhdenc_init.c" />
     <ClCompile Include="..\libavcodec\x86\hevcdsp_init.c" />

SMP/libavcodec.vcxproj.filters

@@ -163,9 +163,6 @@
     <YASM Include="..\libavcodec\x86\pngdsp.asm">
       <Filter>Source Files\libavcodec\x86</Filter>
     </YASM>
-    <YASM Include="..\libavcodec\x86\dcadsp.asm">
-      <Filter>Source Files\libavcodec\x86</Filter>
-    </YASM>
     <YASM Include="..\libavcodec\x86\synth_filter.asm">
       <Filter>Source Files\libavcodec\x86</Filter>
     </YASM>
@@ -945,6 +942,12 @@
     <ClCompile Include="..\libavcodec\cdxl.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\cfhd.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavcodec\cfhddata.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\cinepak.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -984,10 +987,10 @@
     <ClCompile Include="..\libavcodec\dca.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\dcadsp.c">
+    <ClCompile Include="..\libavcodec\dcadata.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\dcadata.c">
+    <ClCompile Include="..\libavcodec\dca_core.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
     <ClCompile Include="..\libavcodec\dca_exss.c">
@@ -996,6 +999,12 @@
     <ClCompile Include="..\libavcodec\dca_xll.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\dcadsp.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavcodec\dcadct.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\synth_filter.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -2586,9 +2595,6 @@
     <ClCompile Include="..\libavcodec\x86\cavsdsp.c">
       <Filter>Source Files\libavcodec\x86</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\x86\dcadsp_init.c">
-      <Filter>Source Files\libavcodec\x86</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavcodec\x86\synth_filter_init.c">
       <Filter>Source Files\libavcodec\x86</Filter>
     </ClCompile>