diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2016-06-25 02:25:44 +0200 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2016-06-25 02:25:44 +0200 |
| commit | ad56f2c46ac6deec86870ec10f2a11a644df07d4 (patch) | |
| tree | 89f2d90c5586560911e67c872b530c77f151168d /sub/ass_mp.h | |
| parent | 0536841647ef7931bffb4386d8ffbb5b2b568e8a (diff) | |
| parent | 393bb2a565dc1e27812e1dd20747814892f80da2 (diff) | |
| download | mpv-ad56f2c46ac6deec86870ec10f2a11a644df07d4.tar.bz2 mpv-ad56f2c46ac6deec86870ec10f2a11a644df07d4.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'sub/ass_mp.h')
| -rw-r--r-- | sub/ass_mp.h | 8 |
1 files 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 */ |