diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-04 01:55:52 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-04 01:55:52 +0200 |
| commit | 8c144171bb80dd3d1f7161b97675e78cad00bc65 (patch) | |
| tree | 7ad930ebc554ab68af1911f4dfd217cc18b86cce /libvo/gl_common.c | |
| parent | 52ee93c1c64dfaa0afc881c38154b04c100cb617 (diff) | |
| parent | 8c5889004f7ba9f6fcbca20a05a9301771348408 (diff) | |
| download | mpv-8c144171bb80dd3d1f7161b97675e78cad00bc65.tar.bz2 mpv-8c144171bb80dd3d1f7161b97675e78cad00bc65.tar.xz | |
Merge svn changes up to r28087
Conflicts:
command.c
libao2/ao_ivtv.c
libao2/ao_v4l2.c
libmpcodecs/dec_video.h
libvo/aspect.h
libvo/sub.c
libvo/sub.h
libvo/vo_directx.c
libvo/vo_macosx.m
libvo/vo_quartz.c
mp_core.h
mplayer.c
mplayer.h
osdep/getch2.h
osdep/timer.h
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 cd75bdb706..0df3e2e74a 100644 --- a/libvo/gl_common.c +++ b/libvo/gl_common.c @@ -187,10 +187,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; @@ -572,7 +572,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); @@ -1469,7 +1469,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); } @@ -1598,9 +1598,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; |