[vlc-devel] [PATCH 1/2] video_filter/puzzle: make some global variables static

[Thomas Guillem]

Ok for the set.

On Fri, Jun 14, 2019, at 20:45, Marvin Scholz wrote:
> Fixes symbol collisions in static libvlc builds where modules are
> statically linked into the app.
> ---
>  modules/video_filter/puzzle.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/modules/video_filter/puzzle.c b/modules/video_filter/puzzle.c
> index 31144fb412..f85f6a10b2 100644
> --- a/modules/video_filter/puzzle.c
> +++ b/modules/video_filter/puzzle.c
> @@ -70,10 +70,10 @@
>  #define ROTATION_TEXT N_("Rotation")
>  #define ROTATION_LONGTEXT N_("Rotation parameter: none;180;90-270;mirror")
>  
> -const int pi_mode_values[] = { (int) 0, (int) 1, (int) 2, (int) 3 };
> -const char *const ppsz_mode_descriptions[] = { N_("jigsaw puzzle"), 
> N_("sliding puzzle"), N_("swap puzzle"), N_("exchange puzzle") };
> -const int pi_rotation_values[] = { (int) 0, (int) 1, (int) 2, (int) 3 
> };
> -const char *const ppsz_rotation_descriptions[] = { N_("0"), 
> N_("0/180"), N_("0/90/180/270"), N_("0/90/180/270/mirror") };
> +static const int pi_mode_values[] = { (int) 0, (int) 1, (int) 2, (int) 
> 3 };
> +static const char *const ppsz_mode_descriptions[] = { N_("jigsaw 
> puzzle"), N_("sliding puzzle"), N_("swap puzzle"), N_("exchange 
> puzzle") };
> +static const int pi_rotation_values[] = { (int) 0, (int) 1, (int) 2, 
> (int) 3 };
> +static const char *const ppsz_rotation_descriptions[] = { N_("0"), 
> N_("0/180"), N_("0/90/180/270"), N_("0/90/180/270/mirror") };
>  
>  #define CFG_PREFIX "puzzle-"
>  
> -- 
> 2.19.1
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel