[FFmpeg-cvslog] avrndec: support lowres for mjpeg

Piotr Bandurski git at videolan.org
Mon Nov 19 01:49:22 CET 2012


ffmpeg | branch: master | Piotr Bandurski <ami_stuff at o2.pl> | Mon Nov  5 18:24:34 2012 +0100| [ade9960fc6f8e324c126ab4a86f2b29b3d97a674] | committer: Michael Niedermayer

avrndec: support lowres for mjpeg

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ade9960fc6f8e324c126ab4a86f2b29b3d97a674
---

 libavcodec/avrndec.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libavcodec/avrndec.c b/libavcodec/avrndec.c
index 361b668..2fa369c 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,
 };
 



More information about the ffmpeg-cvslog mailing list