vmdaudio: correct the silent chunk count in the first block.
authorJustin Ruggles <justin.ruggles@gmail.com>
Wed, 23 Feb 2011 18:11:03 +0000 (13:11 -0500)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 26 Feb 2011 02:16:02 +0000 (03:16 +0100)
This fixes A/V sync with several samples, notably:
http://samples.mplayerhq.hu/game-formats/sierra-vmd/swat_*.vmd

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 6989cb2dae85ea455ffcc8a36a763134fb311e29)

libavcodec/vmdav.c

index c6043e9..53d40a9 100644 (file)
@@ -520,11 +520,7 @@ static int vmdaudio_decode_frame(AVCodecContext *avctx,
         uint32_t flags = AV_RB32(p);
         int raw_block_size = s->block_align *
                              (av_get_bits_per_sample_fmt(avctx->sample_fmt) / 8);
-        int silent_chunks;
-        if(flags == 0xFFFFFFFF)
-            silent_chunks = 32;
-        else
-            silent_chunks = av_log2(flags + 1);
+        int silent_chunks = av_popcount(flags);
         if(*data_size < (s->block_align*silent_chunks + buf_size - 20) * 2)
             return -1;
         *data_size = 0;