From ea098d3462ff200a9712e6552e2d2e8a46d44ebc Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 24 Jun 2016 18:05:34 +0200
Subject: ass_mp.h: remove conditional inclusion guards

This file is only used when libass is enabled. (It used to be different,
when code was more entangled.)
---
 sub/ass_mp.h | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/sub/ass_mp.h b/sub/ass_mp.h
index b4cae24ddc..20f0ebe9bd 100644
--- a/sub/ass_mp.h
+++ b/sub/ass_mp.h
@@ -23,7 +23,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "config.h"
+#include <ass/ass.h>
+#include <ass/ass_types.h>
 
 // This is probably arbitrary.
 // sd_lavc_conv might indirectly still assume this PlayResY, though.
@@ -35,10 +36,6 @@
 // m_color argument
 #define MP_ASS_COLOR(c) MP_ASS_RGBA((c).r, (c).g, (c).b, (c).a)
 
-#if HAVE_LIBASS
-#include <ass/ass.h>
-#include <ass/ass_types.h>
-
 struct MPOpts;
 struct mpv_global;
 struct mp_osd_res;
@@ -57,5 +54,4 @@ struct sub_bitmaps;
 void mp_ass_render_frame(ASS_Renderer *renderer, ASS_Track *track, double time,
                          struct sub_bitmaps *res);
 
-#endif                          /* HAVE_LIBASS */
 #endif                          /* MPLAYER_ASS_MP_H */
-- 
cgit v1.2.3