diff options
| author | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-07-17 21:20:11 +0000 |
|---|---|---|
| committer | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-07-17 21:20:11 +0000 |
| commit | d38a5d0aa06b6c231fcefd6d277bd999b4ba79c5 (patch) | |
| tree | 460fa441bce8d5c7736ffe81a4d28515d5c40d33 /libvo | |
| parent | e083d6218c453ddc55100839bbb01d6fe72013db (diff) | |
| download | mpv-d38a5d0aa06b6c231fcefd6d277bd999b4ba79c5.tar.bz2 mpv-d38a5d0aa06b6c231fcefd6d277bd999b4ba79c5.tar.xz | |
1000000l
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6745 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/vo_xv.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c index ad035d724f..8330a7f2f9 100644 --- a/libvo/vo_xv.c +++ b/libvo/vo_xv.c @@ -746,9 +746,8 @@ static uint32_t get_image(mp_image_t *mpi){ 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]) ){ |