projects: Update for recent upstream merge.

SMP/config.asm

@@ -364,6 +364,7 @@
 %define HAVE_OS2THREADS 0
 %define HAVE_W32THREADS 1
 %define HAVE_AS_DN_DIRECTIVE 0
+%define HAVE_AS_FPU_DIRECTIVE 0
 %define HAVE_AS_FUNC 0
 %define HAVE_AS_OBJECT_ARCH 0
 %define HAVE_ASM_MOD_Q 0
@@ -1821,6 +1822,7 @@
 %define CONFIG_MERGEPLANES_FILTER 1
 %define CONFIG_MESTIMATE_FILTER 1
 %define CONFIG_METADATA_FILTER 1
+%define CONFIG_MIDEQUALIZER_FILTER 1
 %define CONFIG_MINTERPOLATE_FILTER 1
 %define CONFIG_MPDECIMATE_FILTER 1
 %define CONFIG_NEGATE_FILTER 1
@@ -1890,6 +1892,7 @@
 %define CONFIG_SWAPUV_FILTER 1
 %define CONFIG_TBLEND_FILTER 1
 %define CONFIG_TELECINE_FILTER 1
+%define CONFIG_THRESHOLD_FILTER 1
 %define CONFIG_THUMBNAIL_FILTER 1
 %define CONFIG_TILE_FILTER 1
 %define CONFIG_TINTERLACE_FILTER 1

SMP/config.h

@@ -394,6 +394,7 @@
 #define HAVE_OS2THREADS 0
 #define HAVE_W32THREADS 1
 #define HAVE_AS_DN_DIRECTIVE 0
+#define HAVE_AS_FPU_DIRECTIVE 0
 #define HAVE_AS_FUNC 0
 #define HAVE_AS_OBJECT_ARCH 0
 #define HAVE_ASM_MOD_Q 0
@@ -583,7 +584,12 @@
 #define CONFIG_AUDIOTOOLBOX 0
 #define CONFIG_CUDA 1
 #define CONFIG_CUVID 1
-#define CONFIG_D3D11VA 1
+#include <sdkddkver.h>
+#if defined(NTDDI_WIN8)
+#   define CONFIG_D3D11VA 1
+#else
+#   define CONFIG_D3D11VA 0
+#endif
 #define CONFIG_DXVA2 1
 #define CONFIG_NVENC 1
 #define CONFIG_VAAPI 0
@@ -1871,6 +1877,7 @@
 #define CONFIG_MERGEPLANES_FILTER 1
 #define CONFIG_MESTIMATE_FILTER 1
 #define CONFIG_METADATA_FILTER 1
+#define CONFIG_MIDEQUALIZER_FILTER 1
 #define CONFIG_MINTERPOLATE_FILTER 1
 #define CONFIG_MPDECIMATE_FILTER 1
 #define CONFIG_NEGATE_FILTER 1
@@ -1940,6 +1947,7 @@
 #define CONFIG_SWAPUV_FILTER 1
 #define CONFIG_TBLEND_FILTER 1
 #define CONFIG_TELECINE_FILTER 1
+#define CONFIG_THRESHOLD_FILTER 1
 #define CONFIG_THUMBNAIL_FILTER 1
 #define CONFIG_TILE_FILTER 1
 #define CONFIG_TINTERLACE_FILTER 1
@@ -1998,7 +2006,7 @@
 #define CONFIG_H263_VAAPI_HWACCEL 0
 #define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0
 #define CONFIG_H264_CUVID_HWACCEL 1
-#define CONFIG_H264_D3D11VA_HWACCEL 1
+#define CONFIG_H264_D3D11VA_HWACCEL CONFIG_D3D11VA
 #define CONFIG_H264_DXVA2_HWACCEL 1
 #define CONFIG_H264_MEDIACODEC_HWACCEL 0
 #define CONFIG_H264_MMAL_HWACCEL 0
@@ -2009,7 +2017,7 @@
 #define CONFIG_H264_VDPAU_HWACCEL 0
 #define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0
 #define CONFIG_HEVC_CUVID_HWACCEL 1
-#define CONFIG_HEVC_D3D11VA_HWACCEL 1
+#define CONFIG_HEVC_D3D11VA_HWACCEL CONFIG_D3D11VA
 #define CONFIG_HEVC_DXVA2_HWACCEL 1
 #define CONFIG_HEVC_MEDIACODEC_HWACCEL 0
 #define CONFIG_HEVC_QSV_HWACCEL 1
@@ -2022,7 +2030,7 @@
 #define CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL 0
 #define CONFIG_MPEG2_CUVID_HWACCEL 1
 #define CONFIG_MPEG2_XVMC_HWACCEL 0
-#define CONFIG_MPEG2_D3D11VA_HWACCEL 1
+#define CONFIG_MPEG2_D3D11VA_HWACCEL CONFIG_D3D11VA
 #define CONFIG_MPEG2_DXVA2_HWACCEL 1
 #define CONFIG_MPEG2_MMAL_HWACCEL 0
 #define CONFIG_MPEG2_QSV_HWACCEL 1
@@ -2036,7 +2044,7 @@
 #define CONFIG_MPEG4_VDPAU_HWACCEL 0
 #define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
 #define CONFIG_VC1_CUVID_HWACCEL 1
-#define CONFIG_VC1_D3D11VA_HWACCEL 1
+#define CONFIG_VC1_D3D11VA_HWACCEL CONFIG_D3D11VA
 #define CONFIG_VC1_DXVA2_HWACCEL 1
 #define CONFIG_VC1_VAAPI_HWACCEL 0
 #define CONFIG_VC1_VDPAU_HWACCEL 0

SMP/libavcodec.vcxproj

@@ -142,6 +142,7 @@
     <YASM Include="..\libavcodec\x86\v210enc.asm" />
     <YASM Include="..\libavcodec\x86\v210.asm" />
     <YASM Include="..\libavcodec\x86\vorbisdsp.asm" />
+    <YASM Include="..\libavcodec\x86\hpeldsp_vp3.asm" />
     <YASM Include="..\libavcodec\x86\vp6dsp.asm" />
     <YASM Include="..\libavcodec\x86\vp9intrapred.asm" />
     <YASM Include="..\libavcodec\x86\vp9intrapred_16bpp.asm" />
@@ -942,6 +943,7 @@
     <ClCompile Include="..\libavcodec\x86\v210-init.c" />
     <ClCompile Include="..\libavcodec\x86\v210enc_init.c" />
     <ClCompile Include="..\libavcodec\x86\vorbisdsp_init.c" />
+    <ClCompile Include="..\libavcodec\x86\hpeldsp_vp3_init.c" />
     <ClCompile Include="..\libavcodec\x86\vp6dsp_init.c" />
     <ClCompile Include="..\libavcodec\x86\vp9dsp_init.c" />
     <ClCompile Include="..\libavcodec\x86\vp9dsp_init_10bpp.c" />

SMP/libavcodec.vcxproj.filters

@@ -253,6 +253,9 @@
     <YASM Include="..\libavcodec\x86\vorbisdsp.asm">
       <Filter>Source Files\libavcodec\x86</Filter>
     </YASM>
+    <YASM Include="..\libavcodec\x86\hpeldsp_vp3.asm">
+      <Filter>Source Files\libavcodec\x86</Filter>
+    </YASM>
     <YASM Include="..\libavcodec\x86\vp6dsp.asm">
       <Filter>Source Files\libavcodec\x86</Filter>
     </YASM>
@@ -2649,6 +2652,9 @@
     <ClCompile Include="..\libavcodec\x86\vorbisdsp_init.c">
       <Filter>Source Files\libavcodec\x86</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\x86\hpeldsp_vp3_init.c">
+      <Filter>Source Files\libavcodec\x86</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\x86\vp6dsp_init.c">
       <Filter>Source Files\libavcodec\x86</Filter>
     </ClCompile>

SMP/libavcodec/dce_defs.c

@@ -3476,6 +3476,9 @@ void ff_psdsp_init_arm(PSDSPContext *s) {return;}
 void ff_psdsp_init_mips(PSDSPContext *s) {return;}
 void ff_qpeldsp_init_mips(QpelDSPContext *c) {return;}
 void ff_rdft_init_arm(RDFTContext *s) {return;}
+#if !(ARCH_X86_32)
+void ff_rv34_idct_dc_add_mmx(uint8_t *dst, ptrdiff_t stride, int dc) {return;}
+#endif
 void ff_rv34dsp_init_arm(RV34DSPContext *c) {return;}
 void ff_rv40dsp_init_aarch64(RV34DSPContext *c) {return;}
 void ff_rv40dsp_init_arm(RV34DSPContext *c) {return;}

SMP/libavfilter.vcxproj

@@ -261,6 +261,7 @@
     <ClCompile Include="..\libavfilter\vf_mergeplanes.c" />
     <ClCompile Include="..\libavfilter\vf_mestimate.c" />
     <ClCompile Include="..\libavfilter\motion_estimation.c" />
+    <ClCompile Include="..\libavfilter\vf_midequalizer.c" />
     <ClCompile Include="..\libavfilter\vf_minterpolate.c" />
     <ClCompile Include="..\libavfilter\vf_mpdecimate.c" />
     <ClCompile Include="..\libavfilter\vf_nlmeans.c" />
@@ -288,6 +289,7 @@
     <ClCompile Include="..\libavfilter\vf_rotate.c" />
     <ClCompile Include="..\libavfilter\vf_sab.c" />
     <ClCompile Include="..\libavfilter\vf_scale.c" />
+    <ClCompile Include="..\libavfilter\scale.c" />
     <ClCompile Include="..\libavfilter\vf_selectivecolor.c" />
     <ClCompile Include="..\libavfilter\vf_separatefields.c" />
     <ClCompile Include="..\libavfilter\vf_aspect.c" />
@@ -303,6 +305,7 @@
     <ClCompile Include="..\libavfilter\vf_swaprect.c" />
     <ClCompile Include="..\libavfilter\vf_swapuv.c" />
     <ClCompile Include="..\libavfilter\vf_telecine.c" />
+    <ClCompile Include="..\libavfilter\vf_threshold.c" />
     <ClCompile Include="..\libavfilter\vf_thumbnail.c" />
     <ClCompile Include="..\libavfilter\vf_tile.c" />
     <ClCompile Include="..\libavfilter\vf_tinterlace.c" />

SMP/libavfilter.vcxproj.filters

@@ -606,6 +606,9 @@
     <ClCompile Include="..\libavfilter\motion_estimation.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_midequalizer.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_minterpolate.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -687,6 +690,9 @@
     <ClCompile Include="..\libavfilter\vf_scale.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\scale.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_selectivecolor.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -732,6 +738,9 @@
     <ClCompile Include="..\libavfilter\vf_telecine.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_threshold.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_thumbnail.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>