Merge svn changes up to r30065

4 files changed, 26 insertions, 26 deletions

diff --git a/libvo/gl_common.c b/libvo/gl_common.c
index 250f2df2da..f9b8359906 100644
--- a/libvo/gl_common.c
+++ b/libvo/gl_common.c
@@ -1539,7 +1539,7 @@ void glDrawTex(GLfloat x, GLfloat y, GLfloat w, GLfloat h,
   End();
 }
 
-#ifdef GL_WIN32
+#ifdef CONFIG_GL_WIN32
 #include "w32_common.h"
 /**
  * \brief little helper since wglGetProcAddress definition does not fit our
@@ -1635,7 +1635,7 @@ static void swapGlBuffers_w32(MPGLContext *ctx) {
   vo_w32_release_dc(vo_w32_window, vo_hdc);
 }
 #endif
-#ifdef CONFIG_X11
+#ifdef CONFIG_GL_X11
 #ifdef HAVE_LIBDL
 #include <dlfcn.h>
 #endif
@@ -1828,7 +1828,7 @@ int init_mpglcontext(MPGLContext *ctx, enum MPGLType type) {
   memset(ctx, 0, sizeof(*ctx));
   ctx->type = type;
   switch (ctx->type) {
-#ifdef GL_WIN32
+#ifdef CONFIG_GL_WIN32
   case GLTYPE_W32:
     ctx->setGlWindow = setGlWindow_w32;
     ctx->releaseGlContext = releaseGlContext_w32;
@@ -1840,7 +1840,7 @@ int init_mpglcontext(MPGLContext *ctx, enum MPGLType type) {
     ctx->ontop = vo_w32_ontop;
     return vo_w32_init();
 #endif
-#ifdef CONFIG_X11
+#ifdef CONFIG_GL_X11
   case GLTYPE_X11:
     ctx->setGlWindow = setGlWindow_x11;
     ctx->releaseGlContext = releaseGlContext_x11;
@@ -1860,12 +1860,12 @@ int init_mpglcontext(MPGLContext *ctx, enum MPGLType type) {
 void uninit_mpglcontext(MPGLContext *ctx) {
   ctx->releaseGlContext(ctx);
   switch (ctx->type) {
-#ifdef GL_WIN32
+#ifdef CONFIG_GL_WIN32
   case GLTYPE_W32:
     vo_w32_uninit();
     break;
 #endif
-#ifdef CONFIG_X11
+#ifdef CONFIG_GL_X11
   case GLTYPE_X11:
     vo_x11_uninit();
     break;
diff --git a/libvo/gl_common.h b/libvo/gl_common.h
index 5a3b4c4163..654f13caf9 100644
--- a/libvo/gl_common.h
+++ b/libvo/gl_common.h
@@ -27,12 +27,12 @@
 
 #include "video_out.h"
 
-#ifdef GL_WIN32
+#ifdef CONFIG_GL_WIN32
 #include <windows.h>
 #include <GL/gl.h>
 #include "w32_common.h"
 #endif
-#ifdef CONFIG_X11
+#ifdef CONFIG_GL_X11
 #include <GL/gl.h>
 #include <X11/Xlib.h>
 #include <GL/glx.h>
@@ -45,7 +45,7 @@
 #ifndef GLAPIENTRY
 #ifdef APIENTRY
 #define GLAPIENTRY APIENTRY
-#elif defined(GL_WIN32)
+#elif defined(CONFIG_GL_WIN32)
 #define GLAPIENTRY __stdcall
 #else
 #define GLAPIENTRY
@@ -364,15 +364,15 @@ typedef struct MPGLContext {
   enum MPGLType type;
   union {
     int w32;
-#ifdef CONFIG_X11
+#ifdef CONFIG_GL_X11
     XVisualInfo *x11;
 #endif
   } vinfo;
   union {
-#ifdef GL_WIN32
+#ifdef CONFIG_GL_WIN32
     HGLRC w32;
 #endif
-#ifdef CONFIG_X11
+#ifdef CONFIG_GL_X11
     GLXContext x11;
 #endif
   } context;
diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c
index e3c4571b32..fab076355f 100644
--- a/libvo/vo_gl.c
+++ b/libvo/vo_gl.c
@@ -44,7 +44,7 @@ static const vo_info_t info =
 
 const LIBVO_EXTERN(gl)
 
-#ifdef CONFIG_X11
+#ifdef CONFIG_GL_X11
 static int                  wsGLXAttrib[] = { GLX_RGBA,
                                        GLX_RED_SIZE,1,
                                        GLX_GREEN_SIZE,1,
@@ -424,7 +424,7 @@ 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
+#ifdef CONFIG_GL_X11
   if (mesa_bufferptr)
     FreeMemoryMESA(mDisplay, mScreen, mesa_bufferptr);
 #endif
@@ -529,11 +529,11 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin
 
   vo_flipped = !!(flags & VOFLAG_FLIPPING);
 
-#ifdef GL_WIN32
+#ifdef CONFIG_GL_WIN32
   if (glctx.type == GLTYPE_W32 && !vo_w32_config(d_width, d_height, flags))
     return -1;
 #endif
-#ifdef CONFIG_X11
+#ifdef CONFIG_GL_X11
   if (glctx.type == GLTYPE_X11) {
     XVisualInfo *vinfo=glXChooseVisual( mDisplay,mScreen,wsGLXAttrib );
     if (vinfo == NULL)
@@ -762,7 +762,7 @@ static uint32_t get_image(mp_image_t *mpi) {
   mpi->stride[0] = mpi->width * mpi->bpp / 8;
   needed_size = mpi->stride[0] * mpi->height;
   if (mesa_buffer) {
-#ifdef CONFIG_X11
+#ifdef CONFIG_GL_X11
     if (mesa_bufferptr && needed_size > mesa_buffersize) {
       FreeMemoryMESA(mDisplay, mScreen, mesa_bufferptr);
       mesa_bufferptr = NULL;
@@ -990,7 +990,7 @@ static int preinit(const char *arg)
 {
     enum MPGLType gltype = GLTYPE_X11;
     // set defaults
-#ifdef GL_WIN32
+#ifdef CONFIG_GL_WIN32
     gltype = GLTYPE_W32;
 #endif
     many_fmts = 1;
diff --git a/libvo/vo_gl2.c b/libvo/vo_gl2.c
index 70557b07c2..73c09364f7 100644
--- a/libvo/vo_gl2.c
+++ b/libvo/vo_gl2.c
@@ -104,7 +104,7 @@ struct TexSquare
 static GLint getInternalFormat(void)
 {
   switch (glctx.type) {
-#ifdef GL_WIN32
+#ifdef CONFIG_GL_WIN32
   case GLTYPE_W32:
   {
   PIXELFORMATDESCRIPTOR pfd;
@@ -122,7 +122,7 @@ static GLint getInternalFormat(void)
   }
   break;
 #endif
-#ifdef CONFIG_X11
+#ifdef CONFIG_GL_X11
   case GLTYPE_X11:
   if (glXGetConfig(mDisplay, glctx.vinfo.x11, GLX_RED_SIZE, &r_sz) != 0) r_sz = 0;
   if (glXGetConfig(mDisplay, glctx.vinfo.x11, GLX_GREEN_SIZE, &g_sz) != 0) g_sz = 0;
@@ -462,7 +462,7 @@ static void draw_alpha_15(int x0,int y0, int w,int h, unsigned char* src, unsign
 static void draw_alpha_null(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){
 }
 
-#ifdef GL_WIN32
+#ifdef CONFIG_GL_WIN32
 
 static int config_w32(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format) {
   if (!vo_w32_config(d_width, d_height, flags))
@@ -609,7 +609,7 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin
   image_width = width;
   image_format = format;
 
-#ifdef GL_WIN32
+#ifdef CONFIG_GL_WIN32
   if (config_w32(width, height, d_width, d_height, flags, title, format) == -1)
 #else
   if (config_glx(width, height, d_width, d_height, flags, title, format) == -1)
@@ -659,7 +659,7 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin
   return 0;
 }
 
-#ifndef GL_WIN32
+#ifndef CONFIG_GL_WIN32
 static int gl_handlekey(int key)
 {
   if(key=='a'||key=='A') {
@@ -676,7 +676,7 @@ static int gl_handlekey(int key)
 static void check_events(void)
 {
   int e;
-#ifndef GL_WIN32
+#ifndef CONFIG_GL_WIN32
   XEvent         Event;
   char           buf[100];
   KeySym         keySym;
@@ -830,7 +830,7 @@ static int preinit(const char *arg)
 {
   enum MPGLType gltype = GLTYPE_X11;
   // set defaults
-#ifdef GL_WIN32
+#ifdef CONFIG_GL_WIN32
   gltype = GLTYPE_W32;
 #endif
   use_yuv = 0;
@@ -882,7 +882,7 @@ static int control(uint32_t request, void *data)
     case VOCTRL_SET_PANSCAN:
       resize(vo_dwidth, vo_dheight);
       return VO_TRUE;
-#ifndef GL_WIN32
+#ifndef CONFIG_GL_WIN32
     case VOCTRL_SET_EQUALIZER:
     {
       struct voctrl_set_equalizer_args *args = data;