summaryrefslogtreecommitdiffstats
path: root/libass/ass_library.h
diff options
context:
space:
mode:
authorgreg <greg@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-01-08 18:35:44 +0000
committergreg <greg@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-01-08 18:35:44 +0000
commit9aea06cf7dde9592672e4dba09fb03b2b89d6863 (patch)
tree0062d1e95bc58bd51028e14a6d88240a1d94ee7d /libass/ass_library.h
parentf51c039c5fcdc24c3f33e1a48bed73bdb17e9e11 (diff)
downloadmpv-9aea06cf7dde9592672e4dba09fb03b2b89d6863.tar.bz2
mpv-9aea06cf7dde9592672e4dba09fb03b2b89d6863.tar.xz
Update internal libass copy to commit 8db4a5
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30242 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libass/ass_library.h')
-rw-r--r--libass/ass_library.h30
1 files changed, 16 insertions, 14 deletions
diff --git a/libass/ass_library.h b/libass/ass_library.h
index ecf46f342e..e0db5c951f 100644
--- a/libass/ass_library.h
+++ b/libass/ass_library.h
@@ -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>
-struct ass_library_s {
- char* fonts_dir;
- int extract_fonts;
- char** style_overrides;
+typedef struct {
+ char *name;
+ char *data;
+ int size;
+} ASS_Fontdata;
- ass_fontdata_t* fontdata;
- int num_fontdata;
+struct ass_library {
+ char *fonts_dir;
+ int extract_fonts;
+ char **style_overrides;
+
+ 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 */