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

[reimar]

Author: reimar
Date: Fri Sep 18 18:51:19 2009
New Revision: 29688

Log:
Get rid of several (probably) pointless ifdefs

Modified:
   trunk/libvo/vo_gl.c

Modified: trunk/libvo/vo_gl.c
==============================================================================
--- trunk/libvo/vo_gl.c	Thu Sep 17 21:03:31 2009	(r29687)
+++ trunk/libvo/vo_gl.c	Fri Sep 18 18:51:19 2009	(r29688)
@@ -435,10 +435,8 @@ 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;
-#ifndef GL_WIN32
   if (mesa_bufferptr)
     FreeMemoryMESA(mDisplay, mScreen, mesa_bufferptr);
-#endif
   mesa_bufferptr = NULL;
   err_shown = 0;
 }
@@ -545,9 +543,7 @@ config(uint32_t width, uint32_t height, 
   if (use_gui) {
     // GUI creates and manages window for us
     guiGetEvent(guiSetShVideo, 0);
-#ifndef GL_WIN32
     goto glconfig;
-#endif
   }
 #endif
 #ifdef GL_WIN32
@@ -777,7 +773,6 @@ 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) {
-#ifndef GL_WIN32
     if (mesa_bufferptr && needed_size > mesa_buffersize) {
       FreeMemoryMESA(mDisplay, mScreen, mesa_bufferptr);
       mesa_bufferptr = NULL;
@@ -785,7 +780,6 @@ 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)