Merge commit 'd68fb1475856cf93199e2bc4eee3063902c35df7'

[ffmpeg] / libswresample / rematrix_template.c

diff --git a/libswresample/rematrix_template.c b/libswresample/rematrix_template.c
index 95a3b9a8c0a2a2fe31bde8d201c760f7ff2d3018..add65e3155cf21238034f3a2582de2e99d1c8ccd 100644 (file)
--- a/libswresample/rematrix_template.c
+++ b/libswresample/rematrix_template.c
@@ -31,11 +31,16 @@
 #    define INTER double
 #    define RENAME(x) x ## _double
 #elif defined(TEMPLATE_REMATRIX_S16)
-#    define R(x) (((x) + 16384)>>15)
 #    define SAMPLE int16_t
 #    define COEFF int
 #    define INTER int
+#  ifdef TEMPLATE_CLIP
+#    define R(x) av_clip_int16(((x) + 16384)>>15)
+#    define RENAME(x) x ## _clip_s16
+#  else
+#    define R(x) (((x) + 16384)>>15)
 #    define RENAME(x) x ## _s16
+#  endif
 #elif defined(TEMPLATE_REMATRIX_S32)
 #    define R(x) (((x) + 16384)>>15)
 #    define SAMPLE int32_t