RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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.)
This commit is contained in:
wm4 2016-06-24 18:05:34 +02:00
parent 1c3bbd9318
commit ea098d3462
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sub/ass_mp.h
View File

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