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

[reimar]

Author: reimar
Date: Fri Sep 18 20:46:12 2009
New Revision: 29690

Log:
Re-add some ifdefs, partially reverting r29688, since mDisplay and
mScreen are undefined during a Windows build without X11 support.

Modified:
   trunk/libvo/vo_gl.c

Modified: trunk/libvo/vo_gl.c
==============================================================================
--- trunk/libvo/vo_gl.c	Fri Sep 18 20:25:17 2009	(r29689)
+++ trunk/libvo/vo_gl.c	Fri Sep 18 20:46:12 2009	(r29690)
@@ -435,8 +435,10 @@ static void uninitGl(void) {
     DeleteBuffers(2, gl_buffer_uv);
   gl_buffer_uv[0] = gl_buffer_uv[1] = 0; gl_buffersize_uv = 0;
   gl_bufferptr_uv[0] = gl_bufferptr_uv[1] = 0;
+#ifdef CONFIG_X11
   if (mesa_bufferptr)
     FreeMemoryMESA(mDisplay, mScreen, mesa_bufferptr);
+#endif
   mesa_bufferptr = NULL;
   err_shown = 0;
 }
@@ -773,6 +775,7 @@ static uint32_t get_image(mp_image_t *mp
   mpi->stride[0] = mpi->width * mpi->bpp / 8;
   needed_size = mpi->stride[0] * mpi->height;
   if (mesa_buffer) {
+#ifdef CONFIG_X11
     if (mesa_bufferptr && needed_size > mesa_buffersize) {
       FreeMemoryMESA(mDisplay, mScreen, mesa_bufferptr);
       mesa_bufferptr = NULL;
@@ -780,6 +783,7 @@ static uint32_t get_image(mp_image_t *mp
     if (!mesa_bufferptr)
       mesa_bufferptr = AllocateMemoryMESA(mDisplay, mScreen, needed_size, 0, 0, 0);
     mesa_buffersize = needed_size;
+#endif
     mpi->planes[0] = mesa_bufferptr;
   } else {
     if (!gl_buffer)