From 7e1ce6a6acd83cf2d5b21df94d2134b1553635ef Mon Sep 17 00:00:00 2001 From: Christophe GISQUET Date: Sat, 3 Mar 2012 15:09:36 +0100 Subject: dsputil: remove shift parameter from scalarproduct_int16 There is only one caller, which does not need the shifting. Other use cases are situations where different roundings would be needed. The x86 and neon versions are modified accordingly. Signed-off-by: Ronald S. Bultje --- libavcodec/dsputil.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavcodec/dsputil.c') diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index 29c5976596..f5b7d076d1 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -2559,12 +2559,12 @@ static void vector_clipf_c(float *dst, const float *src, float min, float max, i } } -static int32_t scalarproduct_int16_c(const int16_t * v1, const int16_t * v2, int order, int shift) +static int32_t scalarproduct_int16_c(const int16_t * v1, const int16_t * v2, int order) { int res = 0; while (order--) - res += (*v1++ * *v2++) >> shift; + res += *v1++ * *v2++; return res; } -- cgit v1.2.3