From 9dbfc5eb50373dbde02bf7c081d6fe27f3581c19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
Date: Sat, 8 Jun 2013 21:04:29 +0300
Subject: [PATCH] xvideo: do not pretend that the video window was resized
(refs #8696)
---
modules/video_output/xcb/xvideo.c | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/modules/video_output/xcb/xvideo.c b/modules/video_output/xcb/xvideo.c
index fcb670e67b1c..b62cb2619e35 100644
--- a/modules/video_output/xcb/xvideo.c
+++ b/modules/video_output/xcb/xvideo.c
@@ -773,7 +773,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)
@@ -785,19 +784,14 @@ 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 (p_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 (p_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);
--
GitLab