[FFmpeg-cvslog] g729dec: fix scalarproduct_int16 after API change

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 13 21:20:07 2012 +0100| [9ff43569d2ab8ae33c0c67de66691a512c59816f] | committer: Michael Niedermayer

g729dec: fix scalarproduct_int16 after API change

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9ff43569d2ab8ae33c0c67de66691a512c59816f
---

 libavcodec/g729dec.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/g729dec.c b/libavcodec/g729dec.c
index 5e55027..2f70115 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;
 }