projects: Update for recent upstream merge.

SMP/config.asm

@@ -519,6 +519,7 @@
 %define CONFIG_LIBTHEORA 1
 %define CONFIG_LIBTWOLAME 0
 %define CONFIG_LIBV4L2 0
+%define CONFIG_LIBVMAF 0
 %define CONFIG_LIBVORBIS 1
 %define CONFIG_LIBVPX 1
 %define CONFIG_LIBWAVPACK 0
@@ -1846,6 +1847,7 @@
 %define CONFIG_INTERLEAVE_FILTER 1
 %define CONFIG_KERNDEINT_FILTER 1
 %define CONFIG_LENSCORRECTION_FILTER 1
+%define CONFIG_LIBVMAF_FILTER 0
 %define CONFIG_LIMITER_FILTER 1
 %define CONFIG_LOOP_FILTER 1
 %define CONFIG_LUMAKEY_FILTER 1

SMP/config.h

@@ -561,6 +561,7 @@
 #define CONFIG_LIBTHEORA 1
 #define CONFIG_LIBTWOLAME 0
 #define CONFIG_LIBV4L2 0
+#define CONFIG_LIBVMAF 0
 #define CONFIG_LIBVORBIS 1
 #define CONFIG_LIBVPX 1
 #define CONFIG_LIBWAVPACK 0
@@ -1903,6 +1904,7 @@
 #define CONFIG_INTERLEAVE_FILTER 1
 #define CONFIG_KERNDEINT_FILTER 1
 #define CONFIG_LENSCORRECTION_FILTER 1
+#define CONFIG_LIBVMAF_FILTER 0
 #define CONFIG_LIMITER_FILTER 1
 #define CONFIG_LOOP_FILTER 1
 #define CONFIG_LUMAKEY_FILTER 1

SMP/libavcodec/dce_defs.c

@@ -3594,6 +3594,7 @@ void ff_vdpau_vc1_decode_picture(MpegEncContext *s, const uint8_t *buf,
                                  int buf_size) {return;}
 void ff_videodsp_init_aarch64(VideoDSPContext *ctx, int bpc) {return;}
 void ff_videodsp_init_arm(VideoDSPContext *ctx, int bpc) {return;}
+void ff_videodsp_init_mips(VideoDSPContext *ctx, int bpc) {return;}
 void ff_videodsp_init_ppc(VideoDSPContext *ctx, int bpc) {return;}
 void ff_vorbisdsp_init_aarch64(VorbisDSPContext *dsp) {return;}
 void ff_vorbisdsp_init_arm(VorbisDSPContext *dsp) {return;}

SMP/libavfilter/dce_defs.c

@@ -36,16 +36,6 @@ int ff_opencl_transform(AVFilterContext *ctx,
 int ff_opencl_unsharp_init(AVFilterContext *ctx) {return 0;}
 int ff_opencl_unsharp_process_inout_buf(AVFilterContext *ctx, AVFrame *in, AVFrame *out) {return 0;}
 #if !(ARCH_X86_64)
-void ff_limiter_16bit_sse4(const uint8_t *src, uint8_t *dst,
-                           ptrdiff_t slinesize, ptrdiff_t dlinesize,
-                           int w, int h, int min, int max) {return;}
-#endif
-#if !(ARCH_X86_64)
-void ff_limiter_8bit_sse2(const uint8_t *src, uint8_t *dst,
-                          ptrdiff_t slinesize, ptrdiff_t dlinesize,
-                          int w, int h, int min, int max) {return;}
-#endif
-#if !(ARCH_X86_64)
 void ff_multiply3x3_sse2(int16_t *data[3], ptrdiff_t stride, int w, int h,
                          const int16_t coeff[3][3][8]) {return;}
 #endif
@@ -207,6 +197,7 @@ AVFilter ff_asrc_flite = {0};
 AVFilter ff_vf_coreimage = {0};
 AVFilter ff_vf_deinterlace_vaapi = {0};
 AVFilter ff_vf_frei0r = {0};
+AVFilter ff_vf_libvmaf = {0};
 AVFilter ff_vf_ocr = {0};
 AVFilter ff_vf_ocv = {0};
 AVFilter ff_vf_scale_cuda = {0};