Mercurial > mplayer.hg
changeset 28036:463a30e51b44
Cosmetics, whitespace and "... == NULL" to "!..."
author | reimar |
---|---|
date | Wed, 03 Dec 2008 09:58:11 +0000 |
parents | 170c4c26e75d |
children | 74ac3a0f2bcd |
files | libvo/gl_common.c |
diffstat | 1 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/gl_common.c Wed Dec 03 09:27:19 2008 +0000 +++ b/libvo/gl_common.c Wed Dec 03 09:58:11 2008 +0000 @@ -186,10 +186,10 @@ 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 @@ 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 @@ // 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 @@ // 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;