[vlc-commits] vout: use vd->cfg with VOUT_DISPLAY_RESET_PICTURES

Steve Lhomme git at videolan.org
Mon Sep 7 08:17:00 CEST 2020


vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Wed Sep  2 10:10:57 2020 +0200| [96b53b92f40eb798607dd9911d5c7c6acdc50a48] | committer: Steve Lhomme

vout: use vd->cfg with VOUT_DISPLAY_RESET_PICTURES

It's always vd->cfg.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=96b53b92f40eb798607dd9911d5c7c6acdc50a48
---

 modules/hw/vdpau/display.c         | 2 +-
 modules/video_output/wayland/shm.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/hw/vdpau/display.c b/modules/hw/vdpau/display.c
index e3484a7298..5d05cebaf2 100644
--- a/modules/hw/vdpau/display.c
+++ b/modules/hw/vdpau/display.c
@@ -237,7 +237,7 @@ static int Control(vout_display_t *vd, int query, va_list ap)
         vout_display_place_t place;
 
         msg_Dbg(vd, "resetting pictures");
-        vout_display_PlacePicture(&place, src, cfg);
+        vout_display_PlacePicture(&place, src, vd->cfg);
 
         fmt->i_width = src->i_width * place.width / src->i_visible_width;
         fmt->i_height = src->i_height * place.height / src->i_visible_height;
diff --git a/modules/video_output/wayland/shm.c b/modules/video_output/wayland/shm.c
index 10a9cf3d02..7f918ac299 100644
--- a/modules/video_output/wayland/shm.c
+++ b/modules/video_output/wayland/shm.c
@@ -166,7 +166,7 @@ static int Control(vout_display_t *vd, int query, va_list ap)
             video_format_t src;
             assert(sys->viewport == NULL);
 
-            vout_display_PlacePicture(&place, vd->source, cfg);
+            vout_display_PlacePicture(&place, vd->source, vd->cfg);
             video_format_ApplyRotation(&src, vd->source);
 
             fmt->i_width  = src.i_width * place.width



More information about the vlc-commits mailing list