Mercurial > mplayer.hg

changeset 6744:a7c9c075abb6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
1000000l
author michael
date Wed, 17 Jul 2002 21:20:11 +0000
parents 5c6cc735c946
children 9734bfbb200a
files libvo/vo_xv.c
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vo_xv.c	Wed Jul 17 00:54:31 2002 +0000
+++ b/libvo/vo_xv.c	Wed Jul 17 21:20:11 2002 +0000
@@ -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]) ){