vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Wed Aug 29 17:29:33 2018 +0300| [8a2db618c882d869d3dfe849a57b1eb1a268ac8b] | committer: Rémi Denis-Courmont
opengl: syntax error Regression from 90989df9e3aab300c2d09a8eb9c0570e4cba4efa. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8a2db618c882d869d3dfe849a57b1eb1a268ac8b --- modules/video_output/opengl/converter_sw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/video_output/opengl/converter_sw.c b/modules/video_output/opengl/converter_sw.c index 11095811a4..4a839079b3 100644 --- a/modules/video_output/opengl/converter_sw.c +++ b/modules/video_output/opengl/converter_sw.c @@ -233,7 +233,7 @@ tc_pbo_update(const opengl_tex_converter_t *tc, GLuint *textures, tc->vt->BindTexture(tc->tex_target, textures[i]); tc->vt->PixelStorei(GL_UNPACK_ROW_LENGTH, pic->p[i].i_pitch - * tex_width[i] / (pic->p[i].i_visible_pitch ?: 1)); + * tex_width[i] / (pic->p[i].i_visible_pitch ? pic->p[i].i_visible_pitch : 1)); tc->vt->TexSubImage2D(tc->tex_target, 0, 0, 0, tex_width[i], tex_height[i], tc->texs[i].format, tc->texs[i].type, NULL); @@ -488,7 +488,7 @@ upload_plane(const opengl_tex_converter_t *tc, unsigned tex_idx, } else { - tc->vt->PixelStorei(GL_UNPACK_ROW_LENGTH, pitch * width / (visible_pitch ?: 1)); + tc->vt->PixelStorei(GL_UNPACK_ROW_LENGTH, pitch * width / (visible_pitch ? visible_pitch : 1)); tc->vt->TexSubImage2D(tc->tex_target, 0, 0, 0, width, height, tex_format, tex_type, pixels); } _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
