[vlc-commits] glx: do not pretend that the video window was resized (refs #8696)
Rémi Denis-Courmont
git at videolan.org
Sat Jun 8 20:06:25 CEST 2013
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Jun 8 21:06:19 2013 +0300| [aab2088445f11d784a7adb11f24d2eefe450da7c] | committer: Rémi Denis-Courmont
glx: do not pretend that the video window was resized (refs #8696)
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=aab2088445f11d784a7adb11f24d2eefe450da7c
---
modules/video_output/xcb/glx.c | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/modules/video_output/xcb/glx.c b/modules/video_output/xcb/glx.c
index f6b3b5b..05683a4 100644
--- a/modules/video_output/xcb/glx.c
+++ b/modules/video_output/xcb/glx.c
@@ -444,7 +444,6 @@ static int Control (vout_display_t *vd, int query, va_list ap)
{
const vout_display_cfg_t *cfg;
const video_format_t *source;
- bool is_forced = false;
if (query == VOUT_DISPLAY_CHANGE_SOURCE_ASPECT
|| query == VOUT_DISPLAY_CHANGE_SOURCE_CROP)
@@ -456,18 +455,15 @@ static int Control (vout_display_t *vd, int query, va_list ap)
{
source = &vd->source;
cfg = (const vout_display_cfg_t*)va_arg (ap, const vout_display_cfg_t *);
- if (query == VOUT_DISPLAY_CHANGE_DISPLAY_SIZE)
- is_forced = (bool)va_arg (ap, int);
}
/* */
- if (query == VOUT_DISPLAY_CHANGE_DISPLAY_SIZE
- && is_forced
- && (cfg->display.width != vd->cfg->display.width
- ||cfg->display.height != vd->cfg->display.height)
- && vout_window_SetSize (sys->embed,
- cfg->display.width, cfg->display.height))
- return VLC_EGENERIC;
+ if (query == VOUT_DISPLAY_CHANGE_DISPLAY_SIZE && va_arg (ap, int))
+ {
+ vout_window_SetSize (sys->embed,
+ cfg->display.width, cfg->display.height);
+ return VLC_EGENERIC; /* Always fail. See x11.c for rationale. */
+ }
vout_display_place_t place;
vout_display_PlacePicture (&place, source, cfg, false);
More information about the vlc-commits
mailing list