summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGrigori Goronzy <greg@blackbox>2009-06-27 06:52:26 +0200
committerGrigori Goronzy <greg@blackbox>2009-06-27 06:52:26 +0200
commitaf0db69d3f4ca6dfe579135a7d7aa4236e90f0b6 (patch)
tree9b8dac08cbe7e09bbd988fbb37e0932e5e2e18d8
parent4c1f9e93addaa511f96908fe502e8d5709ed7500 (diff)
downloadlibass-af0db69d3f4ca6dfe579135a7d7aa4236e90f0b6.tar.bz2
libass-af0db69d3f4ca6dfe579135a7d7aa4236e90f0b6.tar.xz
Include ass_utils.h instead of mputils.h
-rw-r--r--libass/ass.c1
-rw-r--r--libass/ass_bitmap.c2
-rw-r--r--libass/ass_cache.c2
-rw-r--r--libass/ass_font.c1
-rw-r--r--libass/ass_fontconfig.c2
-rw-r--r--libass/ass_render.c2
-rw-r--r--libass/ass_utils.c1
7 files changed, 3 insertions, 8 deletions
diff --git a/libass/ass.c b/libass/ass.c
index 49a448e..4dba5e2 100644
--- 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 6dac769..46ead6e 100644
--- 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 278b14a..04b3acb 100644
--- 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 8ed8b19..e76420d 100644
--- 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 241ffc8..2e6377a 100644
--- 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 30e68cc..0570fd6 100644
--- 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 90655c4..16f868a 100644
--- 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)