Mercurial > mplayer.hg
changeset 21026:d138463e820b
Collect all includes of mplayer headers in libass in a single file (mputils.h).
| author | eugeni |
|---|---|
| date | Sun, 19 Nov 2006 00:41:00 +0000 |
| parents | eebe384dfb7c |
| children | c26154fca245 |
| files | libass/ass.c libass/ass_bitmap.c libass/ass_cache.c libass/ass_fontconfig.c libass/ass_render.c libass/ass_utils.c libass/mputils.h |
| diffstat | 7 files changed, 16 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/libass/ass.c Sat Nov 18 23:18:09 2006 +0000 +++ b/libass/ass.c Sun Nov 19 00:41:00 2006 +0000 @@ -30,19 +30,14 @@ #include <unistd.h> #include <inttypes.h> -#ifdef HAVE_ENCA -#include "subreader.h" // for guess_buffer_cp -#endif - #ifdef USE_ICONV #include <iconv.h> #endif -#include "mp_msg.h" #include "ass.h" #include "ass_utils.h" #include "ass_library.h" -#include "libvo/sub.h" // for utf8_get_char +#include "mputils.h" typedef enum {PST_UNKNOWN = 0, PST_INFO, PST_STYLES, PST_EVENTS, PST_FONTS} parser_state_t;
--- a/libass/ass_bitmap.c Sat Nov 18 23:18:09 2006 +0000 +++ b/libass/ass_bitmap.c Sun Nov 19 00:41:00 2006 +0000 @@ -25,8 +25,7 @@ #include <ft2build.h> #include FT_GLYPH_H -#include "mp_msg.h" -#include "libvo/font_load.h" // for blur() +#include "mputils.h" #include "ass_bitmap.h" struct ass_synth_priv_s {
--- a/libass/ass_cache.c Sat Nov 18 23:18:09 2006 +0000 +++ b/libass/ass_cache.c Sun Nov 19 00:41:00 2006 +0000 @@ -26,7 +26,7 @@ #include <assert.h> -#include "mp_msg.h" +#include "mputils.h" #include "ass_fontconfig.h" #include "ass_bitmap.h" #include "ass_cache.h"
--- a/libass/ass_fontconfig.c Sat Nov 18 23:18:09 2006 +0000 +++ b/libass/ass_fontconfig.c Sun Nov 19 00:41:00 2006 +0000 @@ -27,7 +27,7 @@ #include <sys/types.h> #include <sys/stat.h> -#include "mp_msg.h" +#include "mputils.h" #include "ass_fontconfig.h" #ifdef HAVE_FONTCONFIG
--- a/libass/ass_render.c Sat Nov 18 23:18:09 2006 +0000 +++ b/libass/ass_render.c Sun Nov 19 00:41:00 2006 +0000 @@ -29,7 +29,7 @@ #include FT_GLYPH_H #include FT_SYNTHESIS_H -#include "mp_msg.h" +#include "mputils.h" #include "ass.h" #include "ass_bitmap.h" @@ -38,9 +38,6 @@ #include "ass_fontconfig.h" #include "ass_library.h" -#include "libvo/sub.h" // for utf8_get_char -#include "libavutil/common.h" - #define MAX_GLYPHS 1000 #define MAX_LINES 100
--- a/libass/ass_utils.c Sat Nov 18 23:18:09 2006 +0000 +++ b/libass/ass_utils.c Sun Nov 19 00:41:00 2006 +0000 @@ -25,7 +25,7 @@ #include <sys/time.h> #include <time.h> -#include "mp_msg.h" +#include "mputils.h" #include "ass_utils.h" int mystrtoi(char** p, int base, int* res)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libass/mputils.h Sun Nov 19 00:41:00 2006 +0000 @@ -0,0 +1,10 @@ +#ifndef __ASS_MPUTILS_H__ +#define __ASS_MPUTILS_H__ + +#include "mp_msg.h" +#include "libvo/font_load.h" // for blur() +#include "subreader.h" // for guess_buffer_cp +#include "libvo/sub.h" // for utf8_get_char +#include "libavutil/common.h" + +#endif