Browse Source

vmdaudio: correct the silent chunk count in the first block.

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>
tags/n0.8
Justin Ruggles Ronald S. Bultje 15 years ago
parent
commit
6989cb2dae
1 changed files with 1 additions and 5 deletions
  1. +1
    -5
      libavcodec/vmdav.c

+ 1
- 5
libavcodec/vmdav.c View 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;


Loading…
Cancel
Save