[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec mjpeg.c,1.119,1.120

[Benjamin Larsson CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv5309/libavcodec

Modified Files:
	mjpeg.c 
Log Message:
Mjpeg interlaced decoding fix, height was wrong while decoding (/2).
Patch by Baptiste Ccoudurier, baptiste _ coudurier at smartjog _ com.


Index: mjpeg.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/mjpeg.c,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- mjpeg.c	12 Jan 2006 22:43:15 -0000	1.119
+++ mjpeg.c	23 Jan 2006 06:40:08 -0000	1.120
@@ -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;