[vlc-commits] gl: fix changing window size
Rémi Denis-Courmont
git at videolan.org
Sun Sep 14 19:12:27 CEST 2014
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Sep 14 20:08:26 2014 +0300| [4c11fc9f46439b8b4250fe565c614b5774dcbd10] | committer: Rémi Denis-Courmont
gl: fix changing window size
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4c11fc9f46439b8b4250fe565c614b5774dcbd10
---
modules/video_output/gl.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/modules/video_output/gl.c b/modules/video_output/gl.c
index 0c6ce6c..defe479 100644
--- a/modules/video_output/gl.c
+++ b/modules/video_output/gl.c
@@ -262,17 +262,11 @@ static int Control (vout_display_t *vd, int query, va_list ap)
const vout_display_cfg_t *c = va_arg (ap, const vout_display_cfg_t *);
const video_format_t *src = &vd->source;
- if (query == VOUT_DISPLAY_CHANGE_DISPLAY_SIZE)
+ if (query == VOUT_DISPLAY_CHANGE_DISPLAY_SIZE && va_arg (ap, int))
{
- bool force = false;
-
- force = va_arg (ap, int);
- if (force
- && (c->display.width != vd->cfg->display.width
- || c->display.height != vd->cfg->display.height)
- && vout_window_SetSize (sys->gl->surface,
- c->display.width, c->display.height))
- return VLC_EGENERIC;
+ vout_window_SetSize (sys->gl->surface,
+ c->display.width, c->display.height);
+ return VLC_EGENERIC;
}
vout_display_place_t place;
More information about the vlc-commits
mailing list