<html><head></head><body>This is obviously wrong since it ends with an assertion failure at opengl/display.c:228. And thus the commits before it make no sense.<br><br>Please revert all.<br><br><div class="gmail_quote">Le 16 janvier 2019 12:06:53 GMT+02:00, Steve Lhomme <git@videolan.org> a écrit :<blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
<pre class="k9mail">vlc | branch: master | Steve Lhomme <robux4@ycbcr.xyz> | Wed Jan 16 10:57:55 2019 +0100| [a28dc3049d06a444d73dd2407efcf4fcff878524] | committer: Steve Lhomme<br><br>opengl: forward the error code from the resize callback<br><br>And return an error in VOUT_DISPLAY_CHANGE_DISPLAY_SIZE if resizing fails.<br><br><blockquote class="gmail_quote" style="margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #729fcf; padding-left: 1ex;"><a href="http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a28dc3049d06a444d73dd2407efcf4fcff878524">http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a28dc3049d06a444d73dd2407efcf4fcff878524</a><br></blockquote><hr> include/vlc_opengl.h | 5 +++--<br> modules/video_output/opengl/display.c | 3 ++-<br> 2 files changed, 5 insertions(+), 3 deletions(-)<br><br>diff --git a/include/vlc_opengl.h b/include/vlc_opengl.h<br>index 25e28934fa..a2e838b699 100644<br>--- a/include/vlc_opengl.h<br>+++ b/include/vlc_opengl.h<br>@@ -96,10 +96,11 @@ static inline void vlc_gl_ReleaseCurrent(vlc_gl_t *gl)<br> gl->releaseCurrent(gl);<br> }<br> <br>-static inline void vlc_gl_Resize(vlc_gl_t *gl, unsigned w, unsigned h)<br>+static inline int vlc_gl_Resize(vlc_gl_t *gl, unsigned w, unsigned h)<br> {<br> if (gl->resize != NULL)<br>- gl->resize(gl, w, h);<br>+ return gl->resize(gl, w, h);<br>+ return VLC_SUCCESS;<br> }<br> <br> static inline void vlc_gl_Swap(vlc_gl_t *gl)<br>diff --git a/modules/video_output/opengl/display.c b/modules/video_output/opengl/display.c<br>index 087e288034..14559110dc 100644<br>--- a/modules/video_output/opengl/display.c<br>+++ b/modules/video_output/opengl/display.c<br>@@ -243,7 +243,8 @@ static int Control (vout_display_t *vd, int query, va_list ap)<br> c.align.vertical = VLC_VIDEO_ALIGN_TOP;<br> <br> vout_display_PlacePicture(&place, src, &c);<br>- vlc_gl_Resize (sys->gl, c.display.width, c.display.height);<br>+ if (vlc_gl_Resize (sys->gl, c.display.width, c.display.height) != VLC_SUCCESS)<br>+ return VLC_EGENERIC;<br> if (vlc_gl_MakeCurrent (sys->gl) != VLC_SUCCESS)<br> return VLC_EGENERIC;<br> vout_display_opengl_SetWindowAspectRatio(sys->vgl, (float)place.width / place.height);<hr>vlc-commits mailing list<br>vlc-commits@videolan.org<br><a href="https://mailman.videolan.org/listinfo/vlc-commits">https://mailman.videolan.org/listinfo/vlc-commits</a><br></pre></blockquote></div><br>-- <br>Envoyé de mon appareil Android avec Courriel K-9 Mail. Veuillez excuser ma brièveté.</body></html>