Mercurial > mplayer.hg

changeset 34862:e28caa1840a0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Do not give out the same buffer to multiple mp_images. In exchange, allow us to provide more image types.
author reimar
date Mon, 21 May 2012 19:59:59 +0000
parents bbbe5519f1e7
children 04cd132753bc
files libvo/vo_gl.c
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vo_gl.c	Mon May 21 19:59:58 2012 +0000
+++ b/libvo/vo_gl.c	Mon May 21 19:59:59 2012 +0000
@@ -926,9 +926,11 @@
     err_shown = 1;
     return VO_FALSE;
   }
+  if (gl_bufferptr) 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))
+      mpi->type != MP_IMGTYPE_IPB &&
+      mpi->type != MP_IMGTYPE_NUMBERED)
     return VO_FALSE;
   if (mesa_buffer) mpi->width = texture_width;
   else if (ati_hack) {