projects: Update for recent upstream merge.

SMP/config.asm

@@ -430,6 +430,7 @@
 %define CONFIG_LIBGSM 0
 %define CONFIG_LIBIEC61883 0
 %define CONFIG_LIBILBC 1
+%define CONFIG_LIBKVAZAAR 0
 %define CONFIG_LIBMFX 1
 %define CONFIG_LIBMODPLUG 1
 %define CONFIG_LIBMP3LAME 1
@@ -1445,6 +1446,7 @@
 %define CONFIG_NVENC_H264_ENCODER 1
 %define CONFIG_NVENC_HEVC_ENCODER 1
 %define CONFIG_HEVC_QSV_ENCODER 1
+%define CONFIG_LIBKVAZAAR_ENCODER 0
 %define CONFIG_MPEG2_QSV_ENCODER 1
 %define CONFIG_ADELAY_FILTER 1
 %define CONFIG_AECHO_FILTER 1
@@ -1526,10 +1528,12 @@
 %define CONFIG_CURVES_FILTER 1
 %define CONFIG_DCTDNOIZ_FILTER 1
 %define CONFIG_DECIMATE_FILTER 1
+%define CONFIG_DEFLATE_FILTER 1
 %define CONFIG_DEJUDDER_FILTER 1
 %define CONFIG_DELOGO_FILTER 1
 %define CONFIG_DESHAKE_FILTER 1
 %define CONFIG_DETELECINE_FILTER 1
+%define CONFIG_DILATION_FILTER 1
 %define CONFIG_DRAWBOX_FILTER 1
 %define CONFIG_DRAWGRAPH_FILTER 1
 %define CONFIG_DRAWGRID_FILTER 1
@@ -1537,6 +1541,7 @@
 %define CONFIG_EDGEDETECT_FILTER 1
 %define CONFIG_ELBG_FILTER 1
 %define CONFIG_EQ_FILTER 1
+%define CONFIG_EROSION_FILTER 1
 %define CONFIG_EXTRACTPLANES_FILTER 1
 %define CONFIG_FADE_FILTER 1
 %define CONFIG_FFTFILT_FILTER 1
@@ -1561,6 +1566,7 @@
 %define CONFIG_HUE_FILTER 1
 %define CONFIG_IDET_FILTER 1
 %define CONFIG_IL_FILTER 1
+%define CONFIG_INFLATE_FILTER 1
 %define CONFIG_INTERLACE_FILTER 1
 %define CONFIG_INTERLEAVE_FILTER 1
 %define CONFIG_KERNDEINT_FILTER 1

SMP/config.h

@@ -469,6 +469,7 @@
 #define CONFIG_LIBGSM 0
 #define CONFIG_LIBIEC61883 0
 #define CONFIG_LIBILBC 1
+#define CONFIG_LIBKVAZAAR 0
 #define CONFIG_LIBMFX 1
 #define CONFIG_LIBMODPLUG 1
 #define CONFIG_LIBMP3LAME 1
@@ -1492,6 +1493,7 @@
 #define CONFIG_NVENC_H264_ENCODER 1
 #define CONFIG_NVENC_HEVC_ENCODER 1
 #define CONFIG_HEVC_QSV_ENCODER 1
+#define CONFIG_LIBKVAZAAR_ENCODER 0
 #define CONFIG_MPEG2_QSV_ENCODER 1
 #define CONFIG_ADELAY_FILTER 1
 #define CONFIG_AECHO_FILTER 1
@@ -1573,10 +1575,12 @@
 #define CONFIG_CURVES_FILTER 1
 #define CONFIG_DCTDNOIZ_FILTER 1
 #define CONFIG_DECIMATE_FILTER 1
+#define CONFIG_DEFLATE_FILTER 1
 #define CONFIG_DEJUDDER_FILTER 1
 #define CONFIG_DELOGO_FILTER 1
 #define CONFIG_DESHAKE_FILTER 1
 #define CONFIG_DETELECINE_FILTER 1
+#define CONFIG_DILATION_FILTER 1
 #define CONFIG_DRAWBOX_FILTER 1
 #define CONFIG_DRAWGRAPH_FILTER 1
 #define CONFIG_DRAWGRID_FILTER 1
@@ -1584,6 +1588,7 @@
 #define CONFIG_EDGEDETECT_FILTER 1
 #define CONFIG_ELBG_FILTER 1
 #define CONFIG_EQ_FILTER 1
+#define CONFIG_EROSION_FILTER 1
 #define CONFIG_EXTRACTPLANES_FILTER 1
 #define CONFIG_FADE_FILTER 1
 #define CONFIG_FFTFILT_FILTER 1
@@ -1608,6 +1613,7 @@
 #define CONFIG_HUE_FILTER 1
 #define CONFIG_IDET_FILTER 1
 #define CONFIG_IL_FILTER 1
+#define CONFIG_INFLATE_FILTER 1
 #define CONFIG_INTERLACE_FILTER 1
 #define CONFIG_INTERLEAVE_FILTER 1
 #define CONFIG_KERNDEINT_FILTER 1

SMP/libavcodec.def

@@ -11,6 +11,7 @@ EXPORTS
     av_bitstream_filter_next
     av_codec_get_chroma_intra_matrix
     av_codec_get_codec_descriptor
+    av_codec_get_codec_properties
     av_codec_get_lowres
     av_codec_get_max_lowres
     av_codec_get_pkt_timebase

SMP/libavfilter.vcxproj

@@ -65,7 +65,9 @@
     <YASM Include="..\libavfilter\x86\vf_idet.asm" />
     <YASM Include="..\libavfilter\x86\vf_interlace.asm" />
     <YASM Include="..\libavfilter\x86\vf_pp7.asm" />
+    <YASM Include="..\libavfilter\x86\vf_psnr.asm" />
     <YASM Include="..\libavfilter\x86\vf_pullup.asm" />
+    <YASM Include="..\libavfilter\x86\vf_removegrain.asm" />
     <YASM Include="..\libavfilter\x86\vf_ssim.asm" />
     <YASM Include="..\libavfilter\x86\af_volume.asm" />
     <YASM Include="..\libavfilter\x86\vf_yadif.asm" />
@@ -246,6 +248,8 @@
     </ClCompile>
     <ClCompile Include="..\libavfilter\vf_decimate.c">
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_neighbor.c">
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_dejudder.c">
     </ClCompile>
     <ClCompile Include="..\libavfilter\vf_delogo.c">
@@ -359,6 +363,7 @@
       <ObjectFileName>$(IntDir)\libavfilter_vf_pp7.obj</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\libavfilter\vf_psnr.c">
+      <ObjectFileName>$(IntDir)\libavfilter_vf_psnr.obj</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\libavfilter\vf_pullup.c">
       <ObjectFileName>$(IntDir)\libavfilter_vf_pullup.obj</ObjectFileName>
@@ -366,6 +371,7 @@
     <ClCompile Include="..\libavfilter\vf_qp.c">
     </ClCompile>
     <ClCompile Include="..\libavfilter\vf_removegrain.c">
+      <ObjectFileName>$(IntDir)\libavfilter_vf_removegrain.obj</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\libavfilter\lswsutils.c">
     </ClCompile>
@@ -481,8 +487,12 @@
     </ClCompile>
     <ClCompile Include="..\libavfilter\x86\vf_pp7_init.c">
     </ClCompile>
+    <ClCompile Include="..\libavfilter\x86\vf_psnr_init.c">
+    </ClCompile>
     <ClCompile Include="..\libavfilter\x86\vf_pullup_init.c">
     </ClCompile>
+    <ClCompile Include="..\libavfilter\x86\vf_removegrain_init.c">
+    </ClCompile>
     <ClCompile Include="..\libavfilter\x86\vf_spp.c">
       <ObjectFileName>$(IntDir)\libavfilter_x86_vf_spp.obj</ObjectFileName>
     </ClCompile>

SMP/libavfilter.vcxproj.filters

@@ -39,9 +39,15 @@
     <YASM Include="..\libavfilter\x86\vf_pp7.asm">
       <Filter>Source Files\libavfilter\x86</Filter>
     </YASM>
+    <YASM Include="..\libavfilter\x86\vf_psnr.asm">
+      <Filter>Source Files\libavfilter\x86</Filter>
+    </YASM>
     <YASM Include="..\libavfilter\x86\vf_pullup.asm">
       <Filter>Source Files\libavfilter\x86</Filter>
     </YASM>
+    <YASM Include="..\libavfilter\x86\vf_removegrain.asm">
+      <Filter>Source Files\libavfilter\x86</Filter>
+    </YASM>
     <YASM Include="..\libavfilter\x86\vf_ssim.asm">
       <Filter>Source Files\libavfilter\x86</Filter>
     </YASM>
@@ -317,6 +323,9 @@
     <ClCompile Include="..\libavfilter\vf_decimate.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_neighbor.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_dejudder.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -653,9 +662,15 @@
     <ClCompile Include="..\libavfilter\x86\vf_pp7_init.c">
       <Filter>Source Files\libavfilter\x86</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\x86\vf_psnr_init.c">
+      <Filter>Source Files\libavfilter\x86</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\x86\vf_pullup_init.c">
       <Filter>Source Files\libavfilter\x86</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\x86\vf_removegrain_init.c">
+      <Filter>Source Files\libavfilter\x86</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\x86\vf_spp.c">
       <Filter>Source Files\libavfilter\x86</Filter>
     </ClCompile>