summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-03-16 14:25:03 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-03-16 14:25:03 +0000
commit91dd12b122e0877acb93f6829e708353c6d8903e (patch)
tree38bda79edd082bd85997666135dcfdab882dabf2
parent20ca58bbfb7927012bcda4b0bf28c3b88c3f99a8 (diff)
downloadmpv-91dd12b122e0877acb93f6829e708353c6d8903e.tar.bz2
mpv-91dd12b122e0877acb93f6829e708353c6d8903e.tar.xz
Check mpi type before returning an DR buffer in get_image, fixes jerkiness
with MPEG1/2 and -dr -slices git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28974 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libvo/vo_gl.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c
index e1db6622bf..2fa0db5c69 100644
--- a/libvo/vo_gl.c
+++ b/libvo/vo_gl.c
@@ -765,6 +765,9 @@ static uint32_t get_image(mp_image_t *mpi) {
return VO_FALSE;
}
if (mpi->flags & MP_IMGFLAG_READABLE) return VO_FALSE;
+ if (mpi->type != MP_IMGTYPE_STATIC && mpi->type != MP_IMGTYPE_TEMP &&
+ (mpi->type != MP_IMGTYPE_NUMBERED || mpi->number))
+ return VO_FALSE;
if (mesa_buffer) mpi->width = texture_width;
else if (ati_hack) {
mpi->width = texture_width;