[vlc-devel] [PATCH] vout/macosx: Do not use passed video_format_t for CROP/ASPECT_RATIO changes

[Steve Lhomme]

My bad, I forgot to change the .m files as well.

LGTM.

On Mon, Aug 7, 2017 at 12:09 PM, Marvin Scholz <epirat07 at gmail.com> wrote:
> Since d9e1ff011ef0ebd262219df8e9ba3948afb7825f this is no longer passed,
> vd->source is used instead.
> ---
>  modules/video_output/macosx.m | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/modules/video_output/macosx.m b/modules/video_output/macosx.m
> index 6e43307af8..cc24a2ed4e 100644
> --- a/modules/video_output/macosx.m
> +++ b/modules/video_output/macosx.m
> @@ -376,13 +376,10 @@ static int Control (vout_display_t *vd, int query, va_list ap)
>                  NSSize windowMinSize = [o_window minSize];
>
>                  const vout_display_cfg_t *cfg;
> -                const video_format_t *source;
>
>                  if (query == VOUT_DISPLAY_CHANGE_SOURCE_ASPECT || query == VOUT_DISPLAY_CHANGE_SOURCE_CROP) {
> -                    source = (const video_format_t *)va_arg (ap, const video_format_t *);
>                      cfg = vd->cfg;
>                  } else {
> -                    source = &vd->source;
>                      cfg = (const vout_display_cfg_t*)va_arg (ap, const vout_display_cfg_t *);
>                  }
>
> @@ -395,7 +392,7 @@ static int Control (vout_display_t *vd, int query, va_list ap)
>                  cfg_tmp.display.height = bounds.size.height;
>
>                  vout_display_place_t place;
> -                vout_display_PlacePicture (&place, source, &cfg_tmp, false);
> +                vout_display_PlacePicture (&place, &vd->source, &cfg_tmp, false);
>                  @synchronized (sys->glView) {
>                      sys->place = place;
>                  }
> --
> 2.11.0 (Apple Git-81)
>
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel