RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Autodetect idcin only if audio properties allow decoding. 

Fixes ticket #2688.
(cherry picked from commit 06bede95fc)
This commit is contained in:
Carl Eugen Hoyos 2013-06-19 16:31:10 +02:00
parent 4abc8e76cb
commit 9ea0f4522f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/idcin.c
View File

@ -91,7 +91,7 @@ typedef struct IdcinDemuxContext {
static int idcin_probe(AVProbeData *p)
{
unsigned int number;
unsigned int number, sample_rate;
/*
* This is what you could call a "probabilistic" file check: id CIN
@ -120,18 +120,18 @@ static int idcin_probe(AVProbeData *p)
return 0;
/* check the audio sample rate */
number = AV_RL32(&p->buf[8]);
if ((number != 0) && ((number < 8000) | (number > 48000)))
sample_rate = AV_RL32(&p->buf[8]);
if (sample_rate && (sample_rate < 8000 || sample_rate > 48000))
return 0;
/* check the audio bytes/sample */
number = AV_RL32(&p->buf[12]);
if (number > 2)
if (number > 2 || sample_rate && !number)
return 0;
/* check the audio channels */
number = AV_RL32(&p->buf[16]);
if (number > 2)
if (number > 2 || sample_rate && !number)
return 0;
/* return half certainly since this check is a bit sketchy */