[SCM] libav/experimental: 16l trocadero: Musepack SV7 decoder may skip more than 16 bits at the beginning of the frame, so make it use skip_bits_long() instead of skip_bits() for that.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit f3d77632d707ca6497289d5e0b7809b6040e18c8
Author: Kostya Shishkov <kostya.shishkov at gmail.com>
Date:   Mon Nov 15 09:30:20 2010 +0000

    16l trocadero: Musepack SV7 decoder may skip more than 16 bits at the
    beginning of the frame, so make it use skip_bits_long() instead of
    skip_bits() for that.
    
    Originally committed as revision 25754 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mpc7.c b/libavcodec/mpc7.c
index 83e1aa4..c5b8d47 100644
--- a/libavcodec/mpc7.c
+++ b/libavcodec/mpc7.c
@@ -206,7 +206,7 @@ static int mpc7_decode_frame(AVCodecContext * avctx,
     bits = av_malloc(((buf_size - 1) & ~3) + FF_INPUT_BUFFER_PADDING_SIZE);
     c->dsp.bswap_buf((uint32_t*)bits, (const uint32_t*)(buf + 4), (buf_size - 4) >> 2);
     init_get_bits(&gb, bits, (buf_size - 4)* 8);
-    skip_bits(&gb, buf[0]);
+    skip_bits_long(&gb, buf[0]);
 
     /* read subband indexes */
     for(i = 0; i <= c->maxbands; i++){

-- 
Libav/FFmpeg packaging