[Mplayer-cvslog] CVS: main/libmpcodecs vd_ffmpeg.c,1.134,1.135

[Michael Niedermayer CVS]

CVS change done by Michael Niedermayer CVS

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var2/tmp/cvs-serv1815

Modified Files:
	vd_ffmpeg.c 
Log Message:
compensate for width/height being picture width/height instead of bitstream width/height


Index: vd_ffmpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_ffmpeg.c,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- vd_ffmpeg.c	26 Sep 2004 12:54:00 -0000	1.134
+++ vd_ffmpeg.c	27 Sep 2004 10:08:57 -0000	1.135
@@ -414,7 +414,7 @@
     sh_video_t * sh = s->opaque;
     int start=0, i;
     int width= s->width;
-    int skip_stride= (width+15)>>4;
+    int skip_stride= ((width<<lavc_param_lowres)+15)>>4;
     uint8_t *skip= &s->coded_frame->mbskip_table[(y>>4)*skip_stride];
     int threshold= s->coded_frame->age;
 #if LIBAVCODEC_BUILD >= 4670
@@ -787,8 +787,8 @@
 	// average MB quantizer
 	{
 	    int x, y;
-	    int w = (avctx->width+15) >> 4;
-	    int h = (avctx->height+15) >> 4;
+	    int w = ((avctx->width  << lavc_param_lowres)+15) >> 4;
+	    int h = ((avctx->height << lavc_param_lowres)+15) >> 4;
 	    int8_t *q = pic->qscale_table;
 	    for( y = 0; y < h; y++ ) {
 		for( x = 0; x < w; x++ )