har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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)
This commit is contained in:
Justin Ruggles 2011-02-23 13:11:03 -05:00 committed by Michael Niedermayer
parent c11c79222e
commit 2be17a71ae
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/vmdav.c
View File

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