[vlc-commits] display: do not pass the vout_display_cfg_t with VOUT_DISPLAY_RESET_PICTURES

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Wed Sep  2 11:38:36 2020 +0200| [bb54b9cfba9577b4f6dc62ca64eee5e5e5bfb591] | committer: Steve Lhomme

display: do not pass the vout_display_cfg_t with VOUT_DISPLAY_RESET_PICTURES

It's always vd->cfg.

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

 include/vlc_vout_display.h         | 2 +-
 modules/hw/vdpau/display.c         | 1 -
 modules/video_output/wayland/shm.c | 1 -
 modules/video_output/xcb/x11.c     | 1 -
 src/video_output/display.c         | 2 +-
 5 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/include/vlc_vout_display.h b/include/vlc_vout_display.h
index e34f8cd65e..87a93c621d 100644
--- a/include/vlc_vout_display.h
+++ b/include/vlc_vout_display.h
@@ -157,7 +157,7 @@ enum vout_display_query {
      * \ref VOUT_DISPLAY_CHANGE_SOURCE_CROP
      * control query returns an error.
      */
-    VOUT_DISPLAY_RESET_PICTURES, /* const vout_display_cfg_t *, video_format_t * */
+    VOUT_DISPLAY_RESET_PICTURES, /* video_format_t * */
 
 #if defined(__OS2__)
     /* Ask the module to acknowledge/refuse the fullscreen state change after
diff --git a/modules/hw/vdpau/display.c b/modules/hw/vdpau/display.c
index 5d05cebaf2..f6bc61d819 100644
--- a/modules/hw/vdpau/display.c
+++ b/modules/hw/vdpau/display.c
@@ -231,7 +231,6 @@ static int Control(vout_display_t *vd, int query, va_list ap)
     {
     case VOUT_DISPLAY_RESET_PICTURES:
     {
-        const vout_display_cfg_t *cfg = va_arg(ap, const vout_display_cfg_t *);
         video_format_t *fmt = va_arg(ap, video_format_t *);
         const video_format_t *src= vd->source;
         vout_display_place_t place;
diff --git a/modules/video_output/wayland/shm.c b/modules/video_output/wayland/shm.c
index 7f918ac299..5c1118f62b 100644
--- a/modules/video_output/wayland/shm.c
+++ b/modules/video_output/wayland/shm.c
@@ -160,7 +160,6 @@ static int Control(vout_display_t *vd, int query, va_list ap)
     {
         case VOUT_DISPLAY_RESET_PICTURES:
         {
-            const vout_display_cfg_t *cfg = va_arg(ap, const vout_display_cfg_t *);
             video_format_t *fmt = va_arg(ap, video_format_t *);
             vout_display_place_t place;
             video_format_t src;
diff --git a/modules/video_output/xcb/x11.c b/modules/video_output/xcb/x11.c
index c18831615d..4e57eea987 100644
--- a/modules/video_output/xcb/x11.c
+++ b/modules/video_output/xcb/x11.c
@@ -181,7 +181,6 @@ static int Control(vout_display_t *vd, int query, va_list ap)
 
     case VOUT_DISPLAY_RESET_PICTURES:
     {
-        va_arg(ap, const vout_display_cfg_t *);
         *va_arg(ap, video_format_t *) = sys->fmt;
         return VLC_SUCCESS;
     }
diff --git a/src/video_output/display.c b/src/video_output/display.c
index 4e3548cdb5..c7a2628a0b 100644
--- a/src/video_output/display.c
+++ b/src/video_output/display.c
@@ -468,7 +468,7 @@ static void vout_display_Reset(vout_display_t *vd)
         osys->pool = NULL;
     }
 
-    if (vout_display_Control(vd, VOUT_DISPLAY_RESET_PICTURES, &osys->cfg,
+    if (vout_display_Control(vd, VOUT_DISPLAY_RESET_PICTURES,
                              &osys->display_fmt)
      || VoutDisplayCreateRender(vd))
         msg_Err(vd, "Failed to adjust render format");