Rename various non-static functions

Rename a few functions to avoid symbol clashes.
Clean up mputils.h.

diff --git a/libass/ass.c b/libass/ass.c
index 19e3fd3646cbf33daae90f91c2ece6b8bad5c2f2..49a448e73a7386cfd4c87e0938e1fee3ac60d3e2 100644 (file)
--- a/libass/ass.c
+++ b/libass/ass.c
@@ -905,7 +905,7 @@ static char *sub_recode(char *data, size_t size, char *codepage)
             || sscanf(codepage, "ENCA:%2s:%99s", enca_lang,
                       enca_fallback) == 2) {
             cp_tmp =
-                guess_buffer_cp((unsigned char *) data, size, enca_lang,
+                ass_guess_buffer_cp((unsigned char *) data, size, enca_lang,
                                 enca_fallback);
         }
 #endif

diff --git a/libass/ass_bitmap.c b/libass/ass_bitmap.c
index 75281dbe14180ff5c5ce7190a323412fe3ca4ccd..6dac76901be10888ff7392310cbfc7347cc54dc1 100644 (file)
--- a/libass/ass_bitmap.c
+++ b/libass/ass_bitmap.c
@@ -340,13 +340,15 @@ int glyph_to_bitmap(ass_synth_priv_t *priv_blur,
         if (blur_radius > 0.0) {
             generate_tables(priv_blur, blur_radius);
             if (*bm_o)
-                blur((*bm_o)->buffer, priv_blur->tmp, (*bm_o)->w,
-                     (*bm_o)->h, (*bm_o)->w, (int *) priv_blur->gt2,
-                     priv_blur->g_r, priv_blur->g_w);
+                ass_gauss_blur((*bm_o)->buffer, priv_blur->tmp,
+                               (*bm_o)->w, (*bm_o)->h, (*bm_o)->w,
+                               (int *) priv_blur->gt2, priv_blur->g_r,
+                               priv_blur->g_w);
             else
-                blur((*bm_g)->buffer, priv_blur->tmp, (*bm_g)->w,
-                     (*bm_g)->h, (*bm_g)->w, (int *) priv_blur->gt2,
-                     priv_blur->g_r, priv_blur->g_w);
+                ass_gauss_blur((*bm_g)->buffer, priv_blur->tmp,
+                               (*bm_g)->w, (*bm_g)->h, (*bm_g)->w,
+                               (int *) priv_blur->gt2, priv_blur->g_r,
+                               priv_blur->g_w);
         }
     }
     if (*bm_o)

diff --git a/libass/ass_fontconfig.c b/libass/ass_fontconfig.c
index 4fb2155718925c29b44870396c9244f348dc2eea..241ffc8c4927d543eb2d5b7f1dc44bff87eb4366 100644 (file)
--- a/libass/ass_fontconfig.c
+++ b/libass/ass_fontconfig.c
@@ -292,7 +292,7 @@ static char *validate_fname(char *name)
     q = fname = malloc(sz + 1);
     p = name;
     while (*p) {
-        code = utf8_get_char(&p);
+        code = ass_utf8_get_char(&p);
         if (code == 0)
             break;
         if ((code > 0x7F) ||

diff --git a/libass/ass_render.c b/libass/ass_render.c
index f21069d85f9c9e6dc0afd0b81619ebaf65a1b7be..592058ceb5172e011227f735742df69f6a7d4a57 100644 (file)
--- a/libass/ass_render.c
+++ b/libass/ass_render.c
@@ -1438,7 +1438,7 @@ static unsigned get_next_char(ass_renderer_t *render_priv, char **str)
             return ' ';
         }
     }
-    chr = utf8_get_char((char **) &p);
+    chr = ass_utf8_get_char((char **) &p);
     *str = p;
     return chr;
 }

diff --git a/libass/mputils.c b/libass/mputils.c
index 611a5154d301ab1882c61089408558b06aa8cda7..7ab7bc0a33ddb70ceca709e85abfeac3be2f6471 100644 (file)
--- a/libass/mputils.c
+++ b/libass/mputils.c
@@ -44,7 +44,7 @@ void ass_msg(int lvl, char *fmt, ...)
     va_end(va);
 }
 
-unsigned utf8_get_char(char **str)
+unsigned ass_utf8_get_char(char **str)
 {
     uint8_t *strp = (uint8_t *) * str;
     unsigned c = *strp++;
@@ -75,7 +75,7 @@ unsigned utf8_get_char(char **str)
 }
 
 // gaussian blur
-void blur(unsigned char *buffer,
+void ass_gauss_blur(unsigned char *buffer,
           unsigned short *tmp2,
           int width, int height, int stride, int *m2, int r, int mwidth)
 {
@@ -194,7 +194,7 @@ void blur(unsigned char *buffer,
 }
 
 #ifdef CONFIG_ENCA
-void *guess_buffer_cp(unsigned char *buffer, int buflen,
+void *ass_guess_buffer_cp(unsigned char *buffer, int buflen,
                       char *preferred_language, char *fallback)
 {
     const char **languages;

diff --git a/libass/mputils.h b/libass/mputils.h
index d99167c981794e27eb54b74346416e530b628c4f..199f74bee0e1be88d25356241f4d282715388692 100644 (file)
--- a/libass/mputils.h
+++ b/libass/mputils.h
@@ -8,19 +8,17 @@
 #define MSGL_V 6
 #define MSGL_DBG2 7
 
-#include "help_mp.h"
+#define FFMAX(a,b) ((a) > (b) ? (a) : (b))
+#define FFMIN(a,b) ((a) > (b) ? (b) : (a))
 
-unsigned utf8_get_char(char **str);
+#include "help_mp.h"
 
+unsigned ass_utf8_get_char(char **str);
 void ass_msg(int lvl, char *fmt, ...);
-
-void blur(unsigned char *buffer, unsigned short *tmp2, int width,
-          int height, int stride, int *m2, int r, int mwidth);
-
-void *guess_buffer_cp(unsigned char *buffer, int buflen,
-                      char *preferred_language, char *fallback);
-
-#define FFMAX(a,b) ((a) > (b) ? (a) : (b))
-#define FFMIN(a,b) ((a) > (b) ? (b) : (a))
+void ass_gauss_blur(unsigned char *buffer, unsigned short *tmp2,
+                    int width, int height, int stride, int *m2,
+                    int r, int mwidth);
+void *ass_guess_buffer_cp(unsigned char *buffer, int buflen,
+                          char *preferred_language, char *fallback);
 
 #endif