summaryrefslogtreecommitdiffstats
path: root/libass
diff options
context:
space:
mode:
Diffstat (limited to 'libass')
-rw-r--r--libass/ass_render.h5
-rw-r--r--libass/ass_shaper.h2
2 files changed, 4 insertions, 3 deletions
diff --git a/libass/ass_render.h b/libass/ass_render.h
index b664c791..194c9068 100644
--- a/libass/ass_render.h
+++ b/libass/ass_render.h
@@ -30,9 +30,6 @@
#include "hb.h"
#endif
-// XXX: fix the inclusion mess so we can avoid doing this here
-typedef struct ass_shaper ASS_Shaper;
-
#include "ass.h"
#include "ass_font.h"
#include "ass_bitmap.h"
@@ -291,6 +288,8 @@ typedef struct {
size_t composite_max_size;
} CacheStore;
+#include "ass_shaper.h"
+
struct ass_renderer {
ASS_Library *library;
FT_Library ftlibrary;
diff --git a/libass/ass_shaper.h b/libass/ass_shaper.h
index e6121d13..b27cd53b 100644
--- a/libass/ass_shaper.h
+++ b/libass/ass_shaper.h
@@ -21,6 +21,8 @@
#include "config.h"
+typedef struct ass_shaper ASS_Shaper;
+
#include <fribidi.h>
#include "ass_render.h"