[FFmpeg-cvslog] Revert "wavpack: Clip samples after shifting"

[Carl Eugen Hoyos]

ffmpeg | branch: release/0.9 | Carl Eugen Hoyos <cehoyos at ag.or.at> | Wed Jan  4 20:34:45 2012 +0100| [9f561ec398a3e3f8ef8c00cd1aedf5be2fc686c5] | committer: Carl Eugen Hoyos

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.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9f561ec398a3e3f8ef8c00cd1aedf5be2fc686c5
---

 libavcodec/wavpack.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c
index f13980b..5b05e59 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)