From 9f561ec398a3e3f8ef8c00cd1aedf5be2fc686c5 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Wed, 4 Jan 2012 20:34:45 +0100 Subject: [PATCH] Revert "wavpack: Clip samples after shifting" This reverts commit 8d055e9079f151f13d34e8e04f4aa7ca0273c448. The original commit introduced ticket #871, do not import the problem into the release branch. --- libavcodec/wavpack.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c index f13980b56a..5b05e59ea9 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) << s->post_shift; + bit = (((S + bit) << s->shift) - bit); if(s->hybrid) bit = av_clip(bit, -s->hybrid_maxclip - 1, s->hybrid_maxclip); - return bit; + return bit << s->post_shift; } static float wv_get_value_float(WavpackFrameContext *s, uint32_t *crc, int S)