From 650fd9c004e0093dacf928a015947f7490c0dfbf Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 11 Nov 2013 14:51:43 +0100 Subject: avformat/avr: check channels and bps in probe Fixes probetest failure Signed-off-by: Michael Niedermayer --- libavformat/avr.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'libavformat/avr.c') diff --git a/libavformat/avr.c b/libavformat/avr.c index 02edf451a8..a33134eed5 100644 --- a/libavformat/avr.c +++ b/libavformat/avr.c @@ -26,9 +26,15 @@ static int avr_probe(AVProbeData *p) { - if (AV_RL32(p->buf) == MKTAG('2', 'B', 'I', 'T')) - return AVPROBE_SCORE_EXTENSION; - return 0; + if (AV_RL32(p->buf) != MKTAG('2', 'B', 'I', 'T')) + 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) -- cgit v1.2.3