From 365e1ec26d7e89a951ebd7851214f59f4aefdec0 Mon Sep 17 00:00:00 2001 From: Derek Buitenhuis Date: Fri, 16 Dec 2011 13:31:28 -0500 Subject: wavpack: Clip samples after shifting It doesn't make much sense to clip pre-shift, nor is it correct for proper decoding. Signed-off-by: Derek Buitenhuis Signed-off-by: Anton Khirnov --- libavcodec/wavpack.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavcodec/wavpack.c') diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c index 11e9904983..5358967704 100644 --- a/libavcodec/wavpack.c +++ b/libavcodec/wavpack.c @@ -405,12 +405,12 @@ static inline int wv_get_value_integer(WavpackFrameContext *s, uint32_t *crc, in } bit = (S & s->and) | s->or; - bit = (((S + bit) << s->shift) - bit); + bit = (((S + bit) << s->shift) - bit) << s->post_shift; if(s->hybrid) bit = av_clip(bit, -s->hybrid_maxclip, s->hybrid_maxclip - 1); - return bit << s->post_shift; + return bit; } static float wv_get_value_float(WavpackFrameContext *s, uint32_t *crc, int S) -- cgit v1.2.3