projects: Update for recent usptream merge.

SMP/config.asm

@@ -964,6 +964,7 @@
 %define CONFIG_VMDVIDEO_DECODER 1
 %define CONFIG_VMNC_DECODER 1
 %define CONFIG_VP3_DECODER 1
+%define CONFIG_VP4_DECODER 1
 %define CONFIG_VP5_DECODER 1
 %define CONFIG_VP6_DECODER 1
 %define CONFIG_VP6A_DECODER 1
@@ -2121,6 +2122,7 @@
 %define CONFIG_IDCIN_DEMUXER 1
 %define CONFIG_IDF_DEMUXER 1
 %define CONFIG_IFF_DEMUXER 1
+%define CONFIG_IFV_DEMUXER 1
 %define CONFIG_ILBC_DEMUXER 1
 %define CONFIG_IMAGE2_DEMUXER 1
 %define CONFIG_IMAGE2PIPE_DEMUXER 1

SMP/config.h

@@ -1034,6 +1034,7 @@
 #define CONFIG_VMDVIDEO_DECODER 1
 #define CONFIG_VMNC_DECODER 1
 #define CONFIG_VP3_DECODER 1
+#define CONFIG_VP4_DECODER 1
 #define CONFIG_VP5_DECODER 1
 #define CONFIG_VP6_DECODER 1
 #define CONFIG_VP6A_DECODER 1
@@ -2243,6 +2244,7 @@
 #define CONFIG_IDCIN_DEMUXER 1
 #define CONFIG_IDF_DEMUXER 1
 #define CONFIG_IFF_DEMUXER 1
+#define CONFIG_IFV_DEMUXER 1
 #define CONFIG_ILBC_DEMUXER 1
 #define CONFIG_IMAGE2_DEMUXER 1
 #define CONFIG_IMAGE2PIPE_DEMUXER 1

SMP/libavcodec/codec_list.c

@@ -407,6 +407,7 @@ static const AVCodec *codec_list[] = {
     &ff_vmdvideo_decoder,
     &ff_vmnc_decoder,
     &ff_vp3_decoder,
+    &ff_vp4_decoder,
     &ff_vp5_decoder,
     &ff_vp6_decoder,
     &ff_vp6a_decoder,

SMP/libavfilter.vcxproj

@@ -68,6 +68,7 @@
     <NASM Include="..\libavfilter\x86\colorspacedsp.asm" />
     <NASM Include="..\libavfilter\x86\vf_framerate.asm" />
     <NASM Include="..\libavfilter\x86\vf_fspp.asm" />
+    <NASM Include="..\libavfilter\x86\vf_gblur.asm" />
     <NASM Include="..\libavfilter\x86\vf_gradfun.asm" />
     <NASM Include="..\libavfilter\x86\vf_hflip.asm" />
     <NASM Include="..\libavfilter\x86\vf_hqdn3d.asm" />
@@ -274,7 +275,6 @@
     <ClCompile Include="..\libavfilter\vf_framepack.c" />
     <ClCompile Include="..\libavfilter\vf_framestep.c" />
     <ClCompile Include="..\libavfilter\vf_freezedetect.c" />
-    <ClCompile Include="..\libavfilter\vf_gblur.c" />
     <ClCompile Include="..\libavfilter\vf_geq.c" />
     <ClCompile Include="..\libavfilter\f_graphmonitor.c" />
     <ClCompile Include="..\libavfilter\vf_colorconstancy.c" />
@@ -397,6 +397,7 @@
     <ClCompile Include="..\libavfilter\x86\vf_bwdif_init.c" />
     <ClCompile Include="..\libavfilter\x86\colorspacedsp_init.c" />
     <ClCompile Include="..\libavfilter\x86\vf_fspp_init.c" />
+    <ClCompile Include="..\libavfilter\x86\vf_gblur_init.c" />
     <ClCompile Include="..\libavfilter\x86\vf_gradfun_init.c" />
     <ClCompile Include="..\libavfilter\x86\vf_framerate_init.c" />
     <ClCompile Include="..\libavfilter\x86\vf_hflip_init.c" />
@@ -446,6 +447,9 @@
     <ClCompile Include="..\libavfilter\vf_fspp.c">
       <ObjectFileName>$(IntDir)\libavfilter_vf_fspp.obj</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_gblur.c">
+      <ObjectFileName>$(IntDir)\libavfilter_vf_gblur.obj</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_gradfun.c">
       <ObjectFileName>$(IntDir)\libavfilter_vf_gradfun.obj</ObjectFileName>
     </ClCompile>

SMP/libavfilter.vcxproj.filters

@@ -58,6 +58,9 @@
     <NASM Include="..\libavfilter\x86\vf_fspp.asm">
       <Filter>Source Files\libavfilter\x86</Filter>
     </NASM>
+    <NASM Include="..\libavfilter\x86\vf_gblur.asm">
+      <Filter>Source Files\libavfilter\x86</Filter>
+    </NASM>
     <NASM Include="..\libavfilter\x86\vf_gradfun.asm">
       <Filter>Source Files\libavfilter\x86</Filter>
     </NASM>
@@ -672,9 +675,6 @@
     <ClCompile Include="..\libavfilter\vf_freezedetect.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavfilter\vf_gblur.c">
-      <Filter>Source Files\libavfilter</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_geq.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -1041,6 +1041,9 @@
     <ClCompile Include="..\libavfilter\x86\vf_fspp_init.c">
       <Filter>Source Files\libavfilter\x86</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\x86\vf_gblur_init.c">
+      <Filter>Source Files\libavfilter\x86</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\x86\vf_gradfun_init.c">
       <Filter>Source Files\libavfilter\x86</Filter>
     </ClCompile>
@@ -1134,6 +1137,9 @@
     <ClCompile Include="..\libavfilter\vf_fspp.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_gblur.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_gradfun.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>

SMP/libavformat.vcxproj

@@ -264,6 +264,7 @@
     <ClCompile Include="..\libavformat\icoenc.c" />
     <ClCompile Include="..\libavformat\idcin.c" />
     <ClCompile Include="..\libavformat\iff.c" />
+    <ClCompile Include="..\libavformat\ifv.c" />
     <ClCompile Include="..\libavformat\ilbc.c" />
     <ClCompile Include="..\libavformat\img2dec.c" />
     <ClCompile Include="..\libavformat\img2enc.c" />

SMP/libavformat.vcxproj.filters

@@ -643,6 +643,9 @@
     <ClCompile Include="..\libavformat\iff.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\ifv.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\ilbc.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>

SMP/libavformat/demuxer_list.c

@@ -122,6 +122,7 @@ static const AVInputFormat *demuxer_list[] = {
     &ff_idcin_demuxer,
     &ff_idf_demuxer,
     &ff_iff_demuxer,
+    &ff_ifv_demuxer,
     &ff_ilbc_demuxer,
     &ff_image2_demuxer,
     &ff_image2pipe_demuxer,