From d1745619dbd794aaf0e7aa51d14af5f99869ec93 Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Sun, 20 Nov 2011 17:07:59 -0500 Subject: [PATCH] adx: check for unsupported ADX formats --- libavcodec/adxdec.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavcodec/adxdec.c b/libavcodec/adxdec.c index f9f17cde95..ee1f1b01f7 100644 --- a/libavcodec/adxdec.c +++ b/libavcodec/adxdec.c @@ -89,6 +89,12 @@ static int adx_decode_header(AVCodecContext *avctx, const uint8_t *buf, if (bufsize < offset || memcmp(buf + offset - 6, "(c)CRI", 6)) return AVERROR_INVALIDDATA; + /* check for encoding=3 block_size=18, sample_size=4 */ + if (buf[4] != 3 || buf[5] != 18 || buf[6] != 4) { + av_log_ask_for_sample(avctx, "unsupported ADX format\n"); + return AVERROR_PATCHWELCOME; + } + c->channels = avctx->channels = buf[7]; if (avctx->channels > 2) return AVERROR_INVALIDDATA;