project: Update for recent upstream merge.

SMP/config.asm

@@ -1846,6 +1846,7 @@
 %define CONFIG_INTERLEAVE_FILTER 1
 %define CONFIG_KERNDEINT_FILTER 1
 %define CONFIG_LENSCORRECTION_FILTER 1
+%define CONFIG_LIMITER_FILTER 1
 %define CONFIG_LOOP_FILTER 1
 %define CONFIG_LUMAKEY_FILTER 1
 %define CONFIG_LUT_FILTER 1

SMP/config.h

@@ -1903,6 +1903,7 @@
 #define CONFIG_INTERLEAVE_FILTER 1
 #define CONFIG_KERNDEINT_FILTER 1
 #define CONFIG_LENSCORRECTION_FILTER 1
+#define CONFIG_LIMITER_FILTER 1
 #define CONFIG_LOOP_FILTER 1
 #define CONFIG_LUMAKEY_FILTER 1
 #define CONFIG_LUT_FILTER 1

SMP/libavcodec/dce_defs.c

@@ -3517,22 +3517,13 @@ 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_64)
-void ff_restore_rgb_planes10_sse2(uint16_t *src_r, uint16_t *src_g, uint16_t *src_b,
-                                  ptrdiff_t linesize_r, ptrdiff_t linesize_g,
-                                  ptrdiff_t linesize_b, int width, int height) {return;}
-#endif
-#if !(ARCH_X86_64)
-void ff_restore_rgb_planes_sse2(uint8_t *src_r, uint8_t *src_g, uint8_t *src_b,
-                                ptrdiff_t linesize_r, ptrdiff_t linesize_g,
-                                ptrdiff_t linesize_b, int width, int height) {return;}
-#endif
 #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;}
+void ff_sbrdsp_init_aarch64(SBRDSPContext *s) {return;}
 void ff_sbrdsp_init_arm(SBRDSPContext *s) {return;}
 void ff_sbrdsp_init_mips(SBRDSPContext *s) {return;}
 #if !(ARCH_X86_64)

SMP/libavfilter.vcxproj

@@ -78,6 +78,7 @@
     <YASM Include="..\libavfilter\x86\vf_hqdn3d.asm" />
     <YASM Include="..\libavfilter\x86\vf_idet.asm" />
     <YASM Include="..\libavfilter\x86\vf_interlace.asm" />
+    <YASM Include="..\libavfilter\x86\vf_limiter.asm" />
     <YASM Include="..\libavfilter\x86\vf_maskedmerge.asm" />
     <YASM Include="..\libavfilter\x86\vf_pp7.asm" />
     <YASM Include="..\libavfilter\x86\vf_psnr.asm" />
@@ -358,6 +359,7 @@
     <ClCompile Include="..\libavfilter\x86\vf_hqdn3d_init.c" />
     <ClCompile Include="..\libavfilter\x86\vf_idet_init.c" />
     <ClCompile Include="..\libavfilter\x86\vf_interlace_init.c" />
+    <ClCompile Include="..\libavfilter\x86\vf_limiter_init.c" />
     <ClCompile Include="..\libavfilter\x86\vf_maskedmerge_init.c" />
     <ClCompile Include="..\libavfilter\x86\vf_pp7_init.c" />
     <ClCompile Include="..\libavfilter\x86\vf_psnr_init.c" />
@@ -402,6 +404,9 @@
     <ClCompile Include="..\libavfilter\vf_interlace.c">
       <ObjectFileName>$(IntDir)\libavfilter_vf_interlace.obj</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_limiter.c">
+      <ObjectFileName>$(IntDir)\libavfilter_vf_limiter.obj</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_maskedmerge.c">
       <ObjectFileName>$(IntDir)\libavfilter_vf_maskedmerge.obj</ObjectFileName>
     </ClCompile>

SMP/libavfilter.vcxproj.filters

@@ -61,6 +61,9 @@
     <YASM Include="..\libavfilter\x86\vf_interlace.asm">
       <Filter>Source Files\libavfilter\x86</Filter>
     </YASM>
+    <YASM Include="..\libavfilter\x86\vf_limiter.asm">
+      <Filter>Source Files\libavfilter\x86</Filter>
+    </YASM>
     <YASM Include="..\libavfilter\x86\vf_maskedmerge.asm">
       <Filter>Source Files\libavfilter\x86</Filter>
     </YASM>
@@ -897,6 +900,9 @@
     <ClCompile Include="..\libavfilter\x86\vf_interlace_init.c">
       <Filter>Source Files\libavfilter\x86</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\x86\vf_limiter_init.c">
+      <Filter>Source Files\libavfilter\x86</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\x86\vf_maskedmerge_init.c">
       <Filter>Source Files\libavfilter\x86</Filter>
     </ClCompile>
@@ -969,6 +975,9 @@
     <ClCompile Include="..\libavfilter\vf_interlace.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_limiter.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_maskedmerge.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>

SMP/libavfilter/dce_defs.c

@@ -36,6 +36,16 @@ 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