[Mplayer-cvslog] CVS: main/libmpcodecs vd_ffmpeg.c,1.39,1.40

[Michael Niedermayer]

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var/tmp.root/cvs-serv20610

Modified Files:
	vd_ffmpeg.c 
Log Message:
compatibility with _OLD_ lavc & uv_stride check


Index: vd_ffmpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_ffmpeg.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- vd_ffmpeg.c	28 Jul 2002 22:29:04 -0000	1.39
+++ vd_ffmpeg.c	2 Aug 2002 12:19:21 -0000	1.40
@@ -73,7 +73,7 @@
 #if LIBAVCODEC_BUILD >= 4614
 	{"gray", &lavc_param_gray, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART, NULL},
 #endif
-	{"vstats", &lavc_param_vstats, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART, NULL},
+	{"vstats", &lavc_param_vstats, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 	{NULL, NULL, 0, 0, 0, 0, NULL}
 };
 
@@ -224,8 +224,8 @@
     int stride[3];
     int start=0, i;
     int skip_stride= (s->width+15)>>4;
-    UINT8 *skip= &s->mbskip_table[(y>>4)*skip_stride];
 #if LIBAVCODEC_BUILD > 4615
+    UINT8 *skip= &s->mbskip_table[(y>>4)*skip_stride];
     int threshold= s->pict_type==B_TYPE ? -99 : s->dr_ip_buffer_count;
 #endif
 
@@ -346,6 +346,10 @@
     if(avctx->dr_stride && avctx->dr_stride !=mpi->stride[0]){
         mp_msg(MSGT_DECVIDEO,MSGL_ERR, "Error: stride changed\n");
     }
+    
+    if(avctx->dr_uvstride && avctx->dr_uvstride !=mpi->stride[1]){
+        mp_msg(MSGT_DECVIDEO,MSGL_ERR, "Error: uvstride changed\n");
+    }
 
     avctx->dr_stride   = mpi->stride[0];
     avctx->dr_uvstride = mpi->stride[1];
@@ -353,6 +357,14 @@
     avctx->dr_opaque_frame = mpi;
     avctx->dr_ip_buffer_count=2; //FIXME
 //printf("%X\n", (int)mpi->planes[0]);
+#if 0
+if(mpi->flags&MP_IMGFLAG_DIRECT)
+    printf("D");
+else if(mpi->flags&MP_IMGFLAG_DRAW_CALLBACK)
+    printf("S");
+else
+    printf(".");
+#endif
 }
 #endif