Mercurial > mplayer.hg
diff libass/ass_library.h @ 30200:48d020c5ceca
Update internal libass copy to commit 8db4a5
author | greg |
---|---|
date | Fri, 08 Jan 2010 18:35:44 +0000 |
parents | 588ce97b44f2 |
children | 88eebbbbd6a0 |
line wrap: on
line diff
--- a/libass/ass_library.h Fri Jan 08 18:19:10 2010 +0000 +++ b/libass/ass_library.h Fri Jan 08 18:35:44 2010 +0000 @@ -1,5 +1,3 @@ -// -*- c-basic-offset: 8; indent-tabs-mode: t -*- -// vim:ts=8:sw=8:noet:ai: /* * Copyright (C) 2006 Evgeniy Stepanov <eugeni.stepanov@gmail.com> * @@ -23,19 +21,23 @@ #ifndef LIBASS_LIBRARY_H #define LIBASS_LIBRARY_H -typedef struct ass_fontdata_s { - char* name; - char* data; - int size; -} ass_fontdata_t; +#include <stdarg.h> + +typedef struct { + char *name; + char *data; + int size; +} ASS_Fontdata; -struct ass_library_s { - char* fonts_dir; - int extract_fonts; - char** style_overrides; +struct ass_library { + char *fonts_dir; + int extract_fonts; + char **style_overrides; - ass_fontdata_t* fontdata; - int num_fontdata; + ASS_Fontdata *fontdata; + int num_fontdata; + void (*msg_callback)(int, const char *, va_list, void *); + void *msg_callback_data; }; -#endif /* LIBASS_LIBRARY_H */ +#endif /* LIBASS_LIBRARY_H */