Commit aab20884 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

glx: do not pretend that the video window was resized (refs #8696)

parent 9dbfc5eb
...@@ -444,7 +444,6 @@ static int Control (vout_display_t *vd, int query, va_list ap) ...@@ -444,7 +444,6 @@ static int Control (vout_display_t *vd, int query, va_list ap)
{ {
const vout_display_cfg_t *cfg; const vout_display_cfg_t *cfg;
const video_format_t *source; const video_format_t *source;
bool is_forced = false;
if (query == VOUT_DISPLAY_CHANGE_SOURCE_ASPECT if (query == VOUT_DISPLAY_CHANGE_SOURCE_ASPECT
|| query == VOUT_DISPLAY_CHANGE_SOURCE_CROP) || query == VOUT_DISPLAY_CHANGE_SOURCE_CROP)
...@@ -456,18 +455,15 @@ static int Control (vout_display_t *vd, int query, va_list ap) ...@@ -456,18 +455,15 @@ static int Control (vout_display_t *vd, int query, va_list ap)
{ {
source = &vd->source; source = &vd->source;
cfg = (const vout_display_cfg_t*)va_arg (ap, const vout_display_cfg_t *); 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 if (query == VOUT_DISPLAY_CHANGE_DISPLAY_SIZE && va_arg (ap, int))
&& is_forced {
&& (cfg->display.width != vd->cfg->display.width vout_window_SetSize (sys->embed,
||cfg->display.height != vd->cfg->display.height) cfg->display.width, cfg->display.height);
&& vout_window_SetSize (sys->embed, return VLC_EGENERIC; /* Always fail. See x11.c for rationale. */
cfg->display.width, cfg->display.height)) }
return VLC_EGENERIC;
vout_display_place_t place; vout_display_place_t place;
vout_display_PlacePicture (&place, source, cfg, false); vout_display_PlacePicture (&place, source, cfg, false);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment