Include ass_utils.h instead of mputils.h

diff --git a/libass/ass.c b/libass/ass.c
index 49a448e73a7386cfd4c87e0938e1fee3ac60d3e2..4dba5e2326b79dc30fab70d5aeacf69da0706b8a 100644 (file)
--- a/libass/ass.c
+++ b/libass/ass.c
@@ -37,7 +37,6 @@
 #include "ass.h"
 #include "ass_utils.h"
 #include "ass_library.h"
-#include "mputils.h"
 
 typedef enum { PST_UNKNOWN =
         0, PST_INFO, PST_STYLES, PST_EVENTS, PST_FONTS } parser_state_t;

diff --git a/libass/ass_bitmap.c b/libass/ass_bitmap.c
index 6dac76901be10888ff7392310cbfc7347cc54dc1..46ead6eae68e348bac85c30a1c148c5311386f95 100644 (file)
--- a/libass/ass_bitmap.c
+++ b/libass/ass_bitmap.c
@@ -25,7 +25,7 @@
 #include <ft2build.h>
 #include FT_GLYPH_H
 
-#include "mputils.h"
+#include "ass_utils.h"
 #include "ass_bitmap.h"
 
 struct ass_synth_priv_s {

diff --git a/libass/ass_cache.c b/libass/ass_cache.c
index 278b14ac9cb0ef28084f9c085138498ec3f227e9..04b3acbc3900991871643da45a68815e3094d566 100644 (file)
--- a/libass/ass_cache.c
+++ b/libass/ass_cache.c
@@ -27,7 +27,7 @@
 
 #include <assert.h>
 
-#include "mputils.h"
+#include "ass_utils.h"
 #include "ass.h"
 #include "ass_fontconfig.h"
 #include "ass_font.h"

diff --git a/libass/ass_font.c b/libass/ass_font.c
index 8ed8b1961bcdead861c1b7ae8bea1d10f2c313be..e76420dd3ab2247bb51338997b1c328d822ac0ad 100644 (file)
--- a/libass/ass_font.c
+++ b/libass/ass_font.c
@@ -34,7 +34,6 @@
 #include "ass_cache.h"
 #include "ass_fontconfig.h"
 #include "ass_utils.h"
-#include "mputils.h"
 
 /**
  * Select Microfost Unicode CharMap, if the font has one.

diff --git a/libass/ass_fontconfig.c b/libass/ass_fontconfig.c
index 241ffc8c4927d543eb2d5b7f1dc44bff87eb4366..2e6377a99688dbeb62a320c2f46450a57e1c14ad 100644 (file)
--- a/libass/ass_fontconfig.c
+++ b/libass/ass_fontconfig.c
@@ -30,7 +30,7 @@
 #include <ft2build.h>
 #include FT_FREETYPE_H
 
-#include "mputils.h"
+#include "ass_utils.h"
 #include "ass.h"
 #include "ass_library.h"
 #include "ass_fontconfig.h"

diff --git a/libass/ass_render.c b/libass/ass_render.c
index 30e68cc41304369a37cf3f29d45632e67f3729ec..0570fd6f0b16cc0687cb34a44ad8ac879014c48e 100644 (file)
--- a/libass/ass_render.c
+++ b/libass/ass_render.c
@@ -29,8 +29,6 @@
 #include FT_GLYPH_H
 #include FT_SYNTHESIS_H
 
-#include "mputils.h"
-
 #include "ass.h"
 #include "ass_font.h"
 #include "ass_bitmap.h"

diff --git a/libass/ass_utils.c b/libass/ass_utils.c
index 90655c4728ac79825c008719b0b2d6d9a1d17cac..16f868a205759b977fa2ba80dae167134c47f94d 100644 (file)
--- a/libass/ass_utils.c
+++ b/libass/ass_utils.c
@@ -25,7 +25,6 @@
 #include <ft2build.h>
 #include FT_GLYPH_H
 
-#include "mputils.h"
 #include "ass_utils.h"
 
 int mystrtoi(char **p, int *res)