Update VS project files for recent merge.

SMC/config.asm

@@ -328,6 +328,7 @@
 %define HAVE_LIBDC1394_1 0
 %define HAVE_LIBDC1394_2 0
 %define HAVE_MAKEINFO 0
+%define HAVE_MAKEINFO_HTML 0
 %define HAVE_PERL 0
 %define HAVE_POD2MAN 0
 %define HAVE_SDL 1
@@ -534,6 +535,7 @@
 %define CONFIG_TPELDSP 1
 %define CONFIG_VIDEODSP 1
 %define CONFIG_VP3DSP 1
+%define CONFIG_WMA_FREQS 1
 %define CONFIG_AAC_ADTSTOASC_BSF 1
 %define CONFIG_CHOMP_BSF 1
 %define CONFIG_DUMP_EXTRADATA_BSF 1

SMC/config.h

@@ -439,6 +439,7 @@
 #define HAVE_LIBDC1394_1 0
 #define HAVE_LIBDC1394_2 0
 #define HAVE_MAKEINFO 0
+#define HAVE_MAKEINFO_HTML 0
 #define HAVE_PERL 0
 #define HAVE_POD2MAN 0
 #define HAVE_SDL 1
@@ -653,6 +654,7 @@
 #define CONFIG_TPELDSP 1
 #define CONFIG_VIDEODSP 1
 #define CONFIG_VP3DSP 1
+#define CONFIG_WMA_FREQS 1
 #define CONFIG_AAC_ADTSTOASC_BSF 1
 #define CONFIG_CHOMP_BSF 1
 #define CONFIG_DUMP_EXTRADATA_BSF 1

SMC/libavcodec.vcxproj

@@ -143,9 +143,6 @@
     <ClCompile Include="..\libavcodec\dct32_float.c">
       <ObjectFileName>$(IntDir)\libavcodec_dct32_float.obj</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\dxva2.c">
-      <ObjectFileName>$(IntDir)\libavcodec_dxva2.obj</ObjectFileName>
-    </ClCompile>
     <ClCompile Include="..\libavcodec\error_resilience.c">
       <ObjectFileName>$(IntDir)\libavcodec_error_resilience.obj</ObjectFileName>
     </ClCompile>
@@ -347,6 +344,9 @@
     <ClCompile Include="..\libavcodec\vp3dsp.c">
       <ObjectFileName>$(IntDir)\libavcodec_vp3dsp.obj</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\wma_freqs.c">
+      <ObjectFileName>$(IntDir)\libavcodec_wma_freqs.obj</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\012v.c">
       <ObjectFileName>$(IntDir)\libavcodec_012v.obj</ObjectFileName>
     </ClCompile>
@@ -578,12 +578,6 @@
     <ClCompile Include="..\libavcodec\binkaudio.c">
       <ObjectFileName>$(IntDir)\libavcodec_binkaudio.obj</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\wma.c">
-      <ObjectFileName>$(IntDir)\libavcodec_wma.obj</ObjectFileName>
-    </ClCompile>
-    <ClCompile Include="..\libavcodec\wma_common.c">
-      <ObjectFileName>$(IntDir)\libavcodec_wma_common.obj</ObjectFileName>
-    </ClCompile>
     <ClCompile Include="..\libavcodec\bintext.c">
       <ObjectFileName>$(IntDir)\libavcodec_bintext.obj</ObjectFileName>
     </ClCompile>
@@ -1148,9 +1142,6 @@
     <ClCompile Include="..\libavcodec\xvididct.c">
       <ObjectFileName>$(IntDir)\libavcodec_xvididct.obj</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\xvid_c_idct.c">
-      <ObjectFileName>$(IntDir)\libavcodec_xvid_c_idct.obj</ObjectFileName>
-    </ClCompile>
     <ClCompile Include="..\libavcodec\mpl2dec.c">
       <ObjectFileName>$(IntDir)\libavcodec_mpl2dec.obj</ObjectFileName>
     </ClCompile>
@@ -1691,9 +1682,15 @@
     <ClCompile Include="..\libavcodec\wmalosslessdec.c">
       <ObjectFileName>$(IntDir)\libavcodec_wmalosslessdec.obj</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\wma_common.c">
+      <ObjectFileName>$(IntDir)\libavcodec_wma_common.obj</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\wmaprodec.c">
       <ObjectFileName>$(IntDir)\libavcodec_wmaprodec.obj</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\wma.c">
+      <ObjectFileName>$(IntDir)\libavcodec_wma.obj</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\wmadec.c">
       <ObjectFileName>$(IntDir)\libavcodec_wmadec.obj</ObjectFileName>
     </ClCompile>
@@ -1823,6 +1820,9 @@
     <ClCompile Include="..\libavcodec\vima.c">
       <ObjectFileName>$(IntDir)\libavcodec_vima.obj</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\dxva2.c">
+      <ObjectFileName>$(IntDir)\libavcodec_dxva2.obj</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\dxva2_h264.c">
       <ObjectFileName>$(IntDir)\libavcodec_dxva2_h264.obj</ObjectFileName>
     </ClCompile>

SMC/libavcodec.vcxproj.filters

@@ -105,9 +105,6 @@
     <ClCompile Include="..\libavcodec\dct32_float.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\dxva2.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavcodec\error_resilience.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -309,6 +306,9 @@
     <ClCompile Include="..\libavcodec\vp3dsp.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\wma_freqs.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\012v.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -540,12 +540,6 @@
     <ClCompile Include="..\libavcodec\binkaudio.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\wma.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
-    <ClCompile Include="..\libavcodec\wma_common.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavcodec\bintext.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -1110,9 +1104,6 @@
     <ClCompile Include="..\libavcodec\xvididct.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\xvid_c_idct.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavcodec\mpl2dec.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -1653,9 +1644,15 @@
     <ClCompile Include="..\libavcodec\wmalosslessdec.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\wma_common.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\wmaprodec.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\wma.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\wmadec.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -1785,6 +1782,9 @@
     <ClCompile Include="..\libavcodec\vima.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\dxva2.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\dxva2_h264.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>

SMC/libavfilter.vcxproj

@@ -599,6 +599,9 @@
     <ClCompile Include="..\libavfilter\x86\vf_hqdn3d_init.c">
       <ObjectFileName>$(IntDir)\libavfilter_x86_vf_hqdn3d_init.obj</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\x86\vf_idet_init.c">
+      <ObjectFileName>$(IntDir)\libavfilter_x86_vf_idet_init.obj</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\x86\vf_pullup_init.c">
       <ObjectFileName>$(IntDir)\libavfilter_x86_vf_pullup_init.obj</ObjectFileName>
     </ClCompile>
@@ -624,6 +627,7 @@
   <ItemGroup>
     <YASM Include="..\libavfilter\x86\vf_gradfun.asm" />
     <YASM Include="..\libavfilter\x86\vf_hqdn3d.asm" />
+    <YASM Include="..\libavfilter\x86\vf_idet.asm" />
     <YASM Include="..\libavfilter\x86\vf_pullup.asm" />
     <YASM Include="..\libavfilter\x86\af_volume.asm" />
     <YASM Include="..\libavfilter\x86\vf_yadif.asm" />

SMC/libavfilter.vcxproj.filters

@@ -564,6 +564,9 @@
     <ClCompile Include="..\libavfilter\x86\vf_hqdn3d_init.c">
       <Filter>Source Files\libavfilter\x86</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\x86\vf_idet_init.c">
+      <Filter>Source Files\libavfilter\x86</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\x86\vf_pullup_init.c">
       <Filter>Source Files\libavfilter\x86</Filter>
     </ClCompile>
@@ -607,6 +610,9 @@
     <YASM Include="..\libavfilter\x86\vf_hqdn3d.asm">
       <Filter>Source Files\libavfilter\x86</Filter>
     </YASM>
+    <YASM Include="..\libavfilter\x86\vf_idet.asm">
+      <Filter>Source Files\libavfilter\x86</Filter>
+    </YASM>
     <YASM Include="..\libavfilter\x86\vf_pullup.asm">
       <Filter>Source Files\libavfilter\x86</Filter>
     </YASM>

SMC/libavutil/ffversion.h

-#ifndef AVUTIL_FFVERSION_H
-#define AVUTIL_FFVERSION_H
-#define FFMPEG_VERSION "2.3.git"
-#endif /* AVUTIL_FFVERSION_H */
+#ifndef AVUTIL_FFVERSION_H
+#define AVUTIL_FFVERSION_H
+#define FFMPEG_VERSION "2.3.git"
+#endif /* AVUTIL_FFVERSION_H */