[Mplayer-cvslog] CVS: main/libvo vo_xv.c,1.103,1.104

[Michael Niedermayer]

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

Modified Files:
	vo_xv.c 
Log Message:
1000000l


Index: vo_xv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xv.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- vo_xv.c	17 Jul 2002 00:54:31 -0000	1.103
+++ vo_xv.c	17 Jul 2002 21:20:11 -0000	1.104
@@ -746,9 +746,8 @@
     if(mpi->type==MP_IMGTYPE_IPB && num_buffers<3 && mpi->flags&MP_IMGFLAG_READABLE) return VO_FALSE; // not enough
     if(mpi->type==MP_IMGTYPE_IP  && num_buffers<2 && mpi->flags&MP_IMGFLAG_READABLE) return VO_FALSE; // not enough
     if(mpi->imgfmt!=image_format || mpi->imgfmt==IMGFMT_BGR24) return VO_FALSE; // needs conversion :(
-    if(  xvimage[current_buf]->pitches[0]*mpi->height 
-       > xvimage[current_buf]->offsets[1] - xvimage[current_buf]->offsets[0]) return VO_FALSE; //buffer to small
-    if(  xvimage[current_buf]->pitches[0] < mpi->width /*FIXME non yv12*/) return VO_FALSE; //buffer to small
+    if(mpi->height > xvimage[current_buf]->height) return VO_FALSE; //buffer to small
+    if(mpi->width*(mpi->bpp/8) > xvimage[current_buf]->pitches[0]) return VO_FALSE; //buffer to small
 //    if(mpi->flags&MP_IMGFLAG_READABLE) return VO_FALSE; // slow video ram
     if( (mpi->flags&(MP_IMGFLAG_ACCEPT_STRIDE|MP_IMGFLAG_ACCEPT_WIDTH)) ||
 	(mpi->width*(mpi->bpp/8)==xvimage[current_buf]->pitches[0]) ){