diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-12-03 09:58:11 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-12-03 09:58:11 +0000 |
commit | a3e78418b9085f7167bd72cf375428f862e5e6cb (patch) | |
tree | 96eef7ca5df5138b8a2134d2ad9dcb0d88870158 /libvo/gl_common.c | |
parent | 7ba61c19c32bab39ceb93170af1420ef239884bf (diff) | |
download | mpv-a3e78418b9085f7167bd72cf375428f862e5e6cb.tar.bz2 mpv-a3e78418b9085f7167bd72cf375428f862e5e6cb.tar.xz |
Cosmetics, whitespace and "... == NULL" to "!..."
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28070 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/gl_common.c')
-rw-r--r-- | libvo/gl_common.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libvo/gl_common.c b/libvo/gl_common.c index 369556b96a..eeb19feb54 100644 --- a/libvo/gl_common.c +++ b/libvo/gl_common.c @@ -186,10 +186,10 @@ int glFindFormat(uint32_t fmt, int *bpp, GLint *gl_texfmt, 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 uvcos, float uvsin) { 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 *context, HWND win) // 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, GLXContext *context, Window win) // 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; |