diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-06-19 16:31:10 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-06-19 23:50:09 +0200 |
| commit | 2a1bebfc83db072cb2c984e4cebb4dd261f9d51f (patch) | |
| tree | f63843c5eed4d0e249a85f38251d7684f2f3111c | |
| parent | 23d835f6113b92f7a3ae9ab8eb091a554ef47d51 (diff) | |
| download | ffmpeg-2a1bebfc83db072cb2c984e4cebb4dd261f9d51f.tar.gz | |
Autodetect idcin only if audio properties allow decoding.
Fixes ticket #2688.
(cherry picked from commit 06bede95fcea47d2e51e8ff248c15311f335b898)
| -rw-r--r-- | libavformat/idcin.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/idcin.c b/libavformat/idcin.c index baff2d446d..6aa259ca9f 100644 --- a/libavformat/idcin.c +++ b/libavformat/idcin.c @@ -90,7 +90,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 @@ -119,18 +119,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 */ |