Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / lsp.c

diff --git a/libavcodec/lsp.c b/libavcodec/lsp.c
index 42a32d79717f7dc2eb284bbb213494f66dbbbef1..374539a02936a2c29c6255a3eeb777cf35175315 100644 (file)
--- a/libavcodec/lsp.c
+++ b/libavcodec/lsp.c
@@ -150,7 +150,11 @@ void ff_acelp_lp_decode(int16_t* lp_1st, int16_t* lp_2nd, const int16_t* lsp_2nd
 
     /* LSP values for first subframe (3.2.5 of G.729, Equation 24)*/
     for(i=0; i<lp_order; i++)
+#ifdef G729_BITEXACT
+        lsp_1st[i] = (lsp_2nd[i] >> 1) + (lsp_prev[i] >> 1);
+#else
         lsp_1st[i] = (lsp_2nd[i] + lsp_prev[i]) >> 1;
+#endif
 
     ff_acelp_lsp2lpc(lp_1st, lsp_1st, lp_order >> 1);