aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2010-05-03 05:57:48 +0000
committerMartin Storsjö <martin@martin.st>2010-05-03 05:57:48 +0000
commitfa36165adf698fe66e3f46c35b8fd79be0fcf66f (patch)
tree63712b7b4b50be0b52aedbd4589111f8ad290896
parent1302ccc1a771d6e713a28fbbf70fc6cd6ae93b07 (diff)
downloadffmpeg-fa36165adf698fe66e3f46c35b8fd79be0fcf66f.tar.gz
amrnbdec: Apply AMR_SAMPLE_SCALE when finishing the decoder output
The output scaling was accidentally removed in rev 22937. Originally committed as revision 23012 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/amrnbdec.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/amrnbdec.c b/libavcodec/amrnbdec.c
index cd2d95b11b..d3fa7653f8 100644
--- a/libavcodec/amrnbdec.c
+++ b/libavcodec/amrnbdec.c
@@ -1043,7 +1043,8 @@ static int amrnb_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
}
ff_acelp_apply_order_2_transfer_function(buf_out, buf_out, highpass_zeros,
- highpass_poles, highpass_gain,
+ highpass_poles,
+ highpass_gain * AMR_SAMPLE_SCALE,
p->high_pass_mem, AMR_BLOCK_SIZE);
/* Update averaged lsf vector (used for fixed gain smoothing).