[vlc-devel] [PATCH] vout/caopengllayer: 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:14 PM, Marvin Scholz <epirat07 at gmail.com> wrote:
> Since d9e1ff011ef0ebd262219df8e9ba3948afb7825f this is no longer passed,
> vd->source is used instead.
> ---
>  modules/video_output/caopengllayer.m | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/modules/video_output/caopengllayer.m b/modules/video_output/caopengllayer.m
> index 430531b2c4..c16687c1a0 100644
> --- a/modules/video_output/caopengllayer.m
> +++ b/modules/video_output/caopengllayer.m
> @@ -333,13 +333,10 @@ static int Control (vout_display_t *vd, int query, va_list ap)
>          case VOUT_DISPLAY_CHANGE_SOURCE_CROP:
>          {
>              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 *);
>              }
>
> @@ -352,7 +349,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);
>              if (OpenglLock(sys->gl))
>                  return VLC_EGENERIC;
>
> --
> 2.11.0 (Apple Git-81)
>
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel