[vlc-commits] video_filter/puzzle: make some global variables static

Marvin Scholz git at videolan.org
Sat Jun 15 13:40:33 CEST 2019


vlc | branch: master | Marvin Scholz <epirat07 at gmail.com> | Fri Jun 14 20:44:51 2019 +0200| [8a3bac0d990bd4fc4b6c621ce9540091cce473c8] | committer: Marvin Scholz

video_filter/puzzle: make some global variables static

Fixes symbol collisions in static libvlc builds where modules are
statically linked into the app.

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

 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-"
 



More information about the vlc-commits mailing list