[MPlayer-cvslog] r28070 - trunk/libvo/gl_common.c

[reimar]

Author: reimar
Date: Wed Dec  3 10:58:11 2008
New Revision: 28070

Log:
Cosmetics, whitespace and "... == NULL" to "!..."


Modified:
   trunk/libvo/gl_common.c

Modified: trunk/libvo/gl_common.c
==============================================================================
--- trunk/libvo/gl_common.c	(original)
+++ trunk/libvo/gl_common.c	Wed Dec  3 10:58:11 2008
@@ -186,10 +186,10 @@ int glFindFormat(uint32_t fmt, int *bpp,
   int dummy1;
   GLenum dummy2;
   GLint dummy3;
-  if (bpp == NULL) bpp = &dummy1;
-  if (gl_texfmt == NULL) gl_texfmt = &dummy3;
-  if (gl_format == NULL) gl_format = &dummy2;
-  if (gl_type == NULL) gl_type = &dummy2;
+  if (!bpp) bpp = &dummy1;
+  if (!gl_texfmt) gl_texfmt = &dummy3;
+  if (!gl_format) gl_format = &dummy2;
+  if (!gl_type) gl_type = &dummy2;
   
   *bpp = IMGFMT_IS_BGR(fmt)?IMGFMT_BGR_DEPTH(fmt):IMGFMT_RGB_DEPTH(fmt);
   *gl_texfmt = 3;
@@ -571,7 +571,7 @@ static void glSetupYUVCombiners(float uv
   if (i < 2)
     mp_msg(MSGT_VO, MSGL_ERR,
            "[gl] 2 general combiners needed for YUV combiner support (found %i)\n", i);
-  glGetIntegerv (GL_MAX_TEXTURE_UNITS, &i);
+  glGetIntegerv(GL_MAX_TEXTURE_UNITS, &i);
   if (i < 3)
     mp_msg(MSGT_VO, MSGL_ERR,
            "[gl] 3 texture units needed for YUV combiner support (found %i)\n", i);
@@ -1468,7 +1468,7 @@ int setGlWindow(int *vinfo, HGLRC *conte
 
   // set context
   if (!wglMakeCurrent(windc, new_context)) {
-    mp_msg (MSGT_VO, MSGL_FATAL, "[gl] Could not set GL context!\n");
+    mp_msg(MSGT_VO, MSGL_FATAL, "[gl] Could not set GL context!\n");
     if (!keep_context) {
       wglDeleteContext(new_context);
     }
@@ -1597,9 +1597,9 @@ int setGlWindow(XVisualInfo **vinfo, GLX
 
   // set context
   if (!glXMakeCurrent(mDisplay, vo_window, new_context)) {
-    mp_msg (MSGT_VO, MSGL_FATAL, "[gl] Could not set GLX context!\n");
+    mp_msg(MSGT_VO, MSGL_FATAL, "[gl] Could not set GLX context!\n");
     if (!keep_context) {
-      glXDestroyContext (mDisplay, new_context);
+      glXDestroyContext(mDisplay, new_context);
       XFree(new_vinfo);
     }
     return SET_WINDOW_FAILED;