From c06e734a0120a528e40d0f07df578643a387937f Mon Sep 17 00:00:00 2001
From: Baptiste Coudurier <baptiste.coudurier@smartjog.com>
Date: Mon, 23 Jan 2006 06:40:08 +0000
Subject: [PATCH] Mjpeg interlaced decoding fix, height was wrong while
decoding (/2). Patch by Baptiste Coudurier, baptiste _ coudurier at smartjog
_ com.
Originally committed as revision 4885 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/mjpeg.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/libavcodec/mjpeg.c b/libavcodec/mjpeg.c
index 2a10934978a..2487f613757 100644
--- a/libavcodec/mjpeg.c
+++ b/libavcodec/mjpeg.c
@@ -1144,7 +1144,6 @@ static int mjpeg_decode_sof(MJpegDecodeContext *s)
s->width = width;
s->height = height;
- avcodec_set_dimensions(s->avctx, width, height);
/* test interlaced mode */
if (s->first_picture &&
@@ -1153,9 +1152,11 @@ static int mjpeg_decode_sof(MJpegDecodeContext *s)
s->interlaced = 1;
// s->bottom_field = (s->interlace_polarity) ? 1 : 0;
s->bottom_field = 0;
- s->avctx->height *= 2;
+ height *= 2;
}
+ avcodec_set_dimensions(s->avctx, width, height);
+
s->qscale_table= av_mallocz((s->width+15)/16);
s->first_picture = 0;
--
GitLab