aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-03-13 21:20:07 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-03-13 21:20:07 +0100
commit9ff43569d2ab8ae33c0c67de66691a512c59816f (patch)
tree7f33c6891b32e551c47f3f69aec03ef8f93e6d91
parente05253bf49e19c601c9d4a872c4f7f985797e163 (diff)
downloadffmpeg-9ff43569d2ab8ae33c0c67de66691a512c59816f.tar.gz
g729dec: fix scalarproduct_int16 after API change
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/g729dec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/g729dec.c b/libavcodec/g729dec.c
index 5e55027b16..2f70115814 100644
--- a/libavcodec/g729dec.c
+++ b/libavcodec/g729dec.c
@@ -333,12 +333,12 @@ static int16_t g729d_voice_decision(int onset, int prev_voice_decision, const in
return voice_decision;
}
-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;
}