[vlc-devel] [PATCH 13/15] display: do not pass the vout_display_cfg_t with VOUT_DISPLAY_RESET_PICTURES

[Thomas Guillem]

OK

On Thu, Sep 3, 2020, at 07:52, Steve Lhomme wrote:
> It's always vd->cfg.
> ---
>  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 830275b1e30..1269da60d84 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 e8d0c1c3e73..3a2ed1d344a 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 7f918ac2998..5c1118f62b9 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 c18831615df..4e57eea9872 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 ea7fd7ae5aa..040adc1d785 100644
> --- a/src/video_output/display.c
> +++ b/src/video_output/display.c
> @@ -469,7 +469,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");
> -- 
> 2.26.2
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel