changeset 3062:8d05d4036b6a libavcodec

Mjpeg interlaced decoding fix, height was wrong while decoding (/2). Patch by Baptiste Coudurier, baptiste _ coudurier at smartjog _ com.
author banan
date Mon, 23 Jan 2006 06:40:08 +0000
parents 259fed5adf5d
children f02d0b59279c
files mjpeg.c
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mjpeg.c	Sun Jan 22 20:54:52 2006 +0000
+++ b/mjpeg.c	Mon Jan 23 06:40:08 2006 +0000
@@ -1144,7 +1144,6 @@
 
         s->width = width;
         s->height = height;
-        avcodec_set_dimensions(s->avctx, width, height);
 
         /* test interlaced mode */
         if (s->first_picture &&
@@ -1153,9 +1152,11 @@
             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;