From ade9960fc6f8e324c126ab4a86f2b29b3d97a674 Mon Sep 17 00:00:00 2001 From: Piotr Bandurski Date: Mon, 5 Nov 2012 18:24:34 +0100 Subject: avrndec: support lowres for mjpeg Signed-off-by: Michael Niedermayer --- libavcodec/avrndec.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'libavcodec/avrndec.c') diff --git a/libavcodec/avrndec.c b/libavcodec/avrndec.c index 361b6683d4..2fa369cb63 100644 --- a/libavcodec/avrndec.c +++ b/libavcodec/avrndec.c @@ -38,6 +38,11 @@ static av_cold int init(AVCodecContext *avctx) // Support "Resolution 1:1" for Avid AVI Codec a->is_mjpeg = avctx->extradata_size < 31 || memcmp(&avctx->extradata[28], "1:1", 3); + if(!a->is_mjpeg && avctx->lowres) { + av_log(avctx, AV_LOG_ERROR, "lowres is not possible with rawvideo\n"); + return AVERROR(EINVAL); + } + if(a->is_mjpeg) return ff_mjpeg_decode_init(avctx); @@ -129,5 +134,6 @@ AVCodec ff_avrn_decoder = { .decode = decode_frame, .long_name = NULL_IF_CONFIG_SMALL("Avid AVI Codec"), .capabilities = CODEC_CAP_DR1, + .max_lowres = 3, }; -- cgit v1.2.3