vlc | branch: master | Zhao Zhili <[email protected]> | Tue Apr 17 16:00:53 2018 +0800| [b663ae7a0c82a0c28c73f8ba6882f7754c864f4c] | committer: Thomas Guillem
opengl: remove newline at the tail of log message Signed-off-by: Thomas Guillem <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b663ae7a0c82a0c28c73f8ba6882f7754c864f4c --- modules/video_output/opengl/converter_cvpx.c | 6 +++--- modules/video_output/opengl/converter_vdpau.c | 2 +- modules/video_output/opengl/vout_helper.c | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/video_output/opengl/converter_cvpx.c b/modules/video_output/opengl/converter_cvpx.c index 906533fd23..df93a90f56 100644 --- a/modules/video_output/opengl/converter_cvpx.c +++ b/modules/video_output/opengl/converter_cvpx.c @@ -123,7 +123,7 @@ tc_cvpx_update(const opengl_tex_converter_t *tc, GLuint *textures, surface, i); if (err != kCGLNoError) { - msg_Err(tc->gl, "CGLTexImageIOSurface2D error: %d: %s\n", i, + msg_Err(tc->gl, "CGLTexImageIOSurface2D error: %u: %s", i, CGLErrorString(err)); return VLC_EGENERIC; } @@ -182,7 +182,7 @@ Open(vlc_object_t *obj) CVEAGLContext eagl_ctx = var_InheritAddress(tc->gl, "ios-eaglcontext"); if (!eagl_ctx) { - msg_Err(tc->gl, "can't find ios-eaglcontext\n"); + msg_Err(tc->gl, "can't find ios-eaglcontext"); free(priv); return VLC_EGENERIC; } @@ -202,7 +202,7 @@ Open(vlc_object_t *obj) priv->gl_ctx = var_InheritAddress(tc->gl, "macosx-glcontext"); if (!priv->gl_ctx) { - msg_Err(tc->gl, "can't find macosx-glcontext\n"); + msg_Err(tc->gl, "can't find macosx-glcontext"); free(priv); return VLC_EGENERIC; } diff --git a/modules/video_output/opengl/converter_vdpau.c b/modules/video_output/opengl/converter_vdpau.c index 6b3467c37e..f3d807a49b 100644 --- a/modules/video_output/opengl/converter_vdpau.c +++ b/modules/video_output/opengl/converter_vdpau.c @@ -42,7 +42,7 @@ GLenum ret = tc->vt->GetError(); \ if (ret != GL_NO_ERROR) \ { \ - msg_Err(tc->gl, #fct " failed: 0x%x\n", ret); \ + msg_Err(tc->gl, #fct " failed: 0x%x", ret); \ return VLC_EGENERIC; \ } \ } diff --git a/modules/video_output/opengl/vout_helper.c b/modules/video_output/opengl/vout_helper.c index 7b988de67e..b58fdc34d4 100644 --- a/modules/video_output/opengl/vout_helper.c +++ b/modules/video_output/opengl/vout_helper.c @@ -469,7 +469,7 @@ opengl_link_program(struct prgm *prgm) int charsWritten; tc->vt->GetShaderInfoLog(shaders[i], infoLength, &charsWritten, infolog); - msg_Err(tc->gl, "shader %d: %s", i, infolog); + msg_Err(tc->gl, "shader %u: %s", i, infolog); free(infolog); } } @@ -512,7 +512,7 @@ opengl_link_program(struct prgm *prgm) x = tc->vt->Get##type##Location(prgm->id, str); \ assert(x != -1); \ if (x == -1) { \ - msg_Err(tc->gl, "Unable to Get"#type"Location(%s)\n", str); \ + msg_Err(tc->gl, "Unable to Get"#type"Location(%s)", str); \ goto error; \ } \ } while (0) @@ -730,7 +730,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt, const vlc_viewpoint_t *viewpoint) { if (gl->getProcAddress == NULL) { - msg_Err(gl, "getProcAddress not implemented, bailing out\n"); + msg_Err(gl, "getProcAddress not implemented, bailing out"); return NULL; } @@ -748,7 +748,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt, #define GET_PROC_ADDR_EXT(name, critical) do { \ vgl->vt.name = vlc_gl_GetProcAddress(gl, "gl"#name); \ if (vgl->vt.name == NULL && critical) { \ - msg_Err(gl, "gl"#name" symbol not found, bailing out\n"); \ + msg_Err(gl, "gl"#name" symbol not found, bailing out"); \ free(vgl); \ return NULL; \ } \ @@ -843,7 +843,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt, assert(extensions); if (!extensions) { - msg_Err(gl, "glGetString returned NULL\n"); + msg_Err(gl, "glGetString returned NULL"); free(vgl); return NULL; } @@ -852,7 +852,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt, bool supports_shaders = strverscmp((const char *)ogl_version, "2.0") >= 0; if (!supports_shaders) { - msg_Err(gl, "shaders not supported, bailing out\n"); + msg_Err(gl, "shaders not supported, bailing out"); free(vgl); return NULL; } _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
