[MPlayer-cvslog] r34950 - trunk/libvo/vo_gl.c

[reimar]

Author: reimar
Date: Mon May 21 21:59:59 2012
New Revision: 34950

Log:
Do not give out the same buffer to multiple mp_images.

In exchange, allow us to provide more image types.

Modified:
   trunk/libvo/vo_gl.c

Modified: trunk/libvo/vo_gl.c
==============================================================================
--- trunk/libvo/vo_gl.c	Mon May 21 21:59:58 2012	(r34949)
+++ trunk/libvo/vo_gl.c	Mon May 21 21:59:59 2012	(r34950)
@@ -926,9 +926,11 @@ static uint32_t get_image(mp_image_t *mp
     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) {