videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

Merge commit '3ca14aa5964ea5d11f7a15f9fff17924d6096d44' 

* commit '3ca14aa5964ea5d11f7a15f9fff17924d6096d44':
  rl2: Avoid a division by zero

See: f371396dfb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-09-20 14:56:00 +02:00
parent 6c18775bae 3ca14aa596
commit 2a930fa29e
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/rl2.c
View File

@ -136,8 +136,10 @@ static av_cold int rl2_read_header(AVFormatContext *s)
/** setup audio stream if present */
if(sound_rate){
if(channels <= 0)
if (!channels || channels > 42) {
av_log(s, AV_LOG_ERROR, "Invalid number of channels: %d\n", channels);
return AVERROR_INVALIDDATA;
}
pts_num = def_sound_size;
pts_den = rate;