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

avformat/avr: check channels and bps in probe

Browse Source 
Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-11-11 14:51:43 +01:00
parent 676bc505f7
commit 650fd9c004
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/avr.c
View File

@ -26,9 +26,15 @@
static int avr_probe(AVProbeData *p) static int avr_probe(AVProbeData *p)
{ {
if (AV_RL32(p->buf) == MKTAG('2', 'B', 'I', 'T')) if (AV_RL32(p->buf) != MKTAG('2', 'B', 'I', 'T'))
return AVPROBE_SCORE_EXTENSION; return 0;
return 0;
if (!AV_RB16(p->buf+12) || AV_RB16(p->buf+12) > 256) // channels
return AVPROBE_SCORE_EXTENSION/2;
if (AV_RB16(p->buf+14) > 256) // bps
return AVPROBE_SCORE_EXTENSION/2;
return AVPROBE_SCORE_EXTENSION;
} }
static int avr_read_header(AVFormatContext *s) static int avr_read_header(AVFormatContext *s)