projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1302ccc
)
amrnbdec: Apply AMR_SAMPLE_SCALE when finishing the decoder output
author
Martin Storsjö
<martin@martin.st>
Mon, 3 May 2010 05:57:48 +0000
(
05:57
+0000)
committer
Martin Storsjö
<martin@martin.st>
Mon, 3 May 2010 05:57:48 +0000
(
05:57
+0000)
The output scaling was accidentally removed in rev 22937.
Originally committed as revision 23012 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavcodec/amrnbdec.c
patch
|
blob
|
history
diff --git
a/libavcodec/amrnbdec.c
b/libavcodec/amrnbdec.c
index
cd2d95b
..
d3fa765
100644
(file)
--- 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).