generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

segafilm: Fix potential division by 0 on corrupted streams in the demuxer

Browse Source 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
This commit is contained in:
Laurent Aimar 2011-09-12 21:09:57 +02:00 committed by Janne Grunau
parent 790f4dd5c9
commit 762ffa6861
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/segafilm.c
View File

@ -113,12 +113,15 @@ static int film_read_header(AVFormatContext *s,
film->audio_bits = scratch[22]; film->audio_bits = scratch[22];
if (scratch[23] == 2) if (scratch[23] == 2)
film->audio_type = CODEC_ID_ADPCM_ADX; film->audio_type = CODEC_ID_ADPCM_ADX;
else if (film->audio_bits == 8) else if (film->audio_channels > 0) {
if (film->audio_bits == 8)
film->audio_type = CODEC_ID_PCM_S8; film->audio_type = CODEC_ID_PCM_S8;
else if (film->audio_bits == 16) else if (film->audio_bits == 16)
film->audio_type = CODEC_ID_PCM_S16BE; film->audio_type = CODEC_ID_PCM_S16BE;
else else
film->audio_type = CODEC_ID_NONE; film->audio_type = CODEC_ID_NONE;
} else
film->audio_type = CODEC_ID_NONE;
} }
if (AV_RB32(&scratch[0]) != FDSC_TAG) if (AV_RB32(&scratch[0]) != FDSC_TAG)