[vlc-devel] [PATCH 2/3] vout: don't override cfg->display size

[Rémi Denis-Courmont]

This is completely wrong. This is meant to be the configured size. Nothing else and anything else *will* break one settings combination or other.

Le 8 novembre 2019 19:56:16 GMT+09:00, Thomas Guillem <thomas at gllm.fr> a écrit :
>This will be needed by the next commit since the cfg->display size will
>be
>modified by window plugin events.
>
>Refs #22674
>---
> src/video_output/video_output.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
>diff --git a/src/video_output/video_output.c
>b/src/video_output/video_output.c
>index 3d2d78f6f23..db48538fd9c 100644
>--- a/src/video_output/video_output.c
>+++ b/src/video_output/video_output.c
>@@ -643,8 +643,10 @@ static void VoutGetDisplayCfg(vout_thread_t *vout,
>const video_format_t *fmt, vo
> 
>     const int display_width = var_GetInteger(vout, "width");
>     const int display_height = var_GetInteger(vout, "height");
>-    cfg->display.width   = display_width > 0  ? display_width  : 0;
>-    cfg->display.height  = display_height > 0 ? display_height : 0;
>+    if (display_width > 0)
>+        cfg->display.width = display_width;
>+    if (display_height > 0)
>+        cfg->display.height = display_height;
>     cfg->is_display_filled  = var_GetBool(vout, "autoscale");
>     unsigned msar_num, msar_den;
> if (var_InheritURational(vout, &msar_num, &msar_den, "monitor-par") ||
>-- 
>2.20.1
>
>_______________________________________________
>vlc-devel mailing list
>To unsubscribe or modify your subscription options:
>https://mailman.videolan.org/listinfo/vlc-devel

-- 
Envoyé de mon appareil Android avec Courriel K-9 Mail. Veuillez excuser ma brièveté.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20191108/8abb6ec7/attachment.html>