Mercurial > mplayer.hg

changeset 25897:aaebaf255b23

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Consistently give all libass multiple inclusion guards a LIBASS_ prefix.
author diego
date Tue, 29 Jan 2008 23:25:11 +0000
parents 5745272a5636
children b61b5a697afc
files libass/ass.h libass/ass_bitmap.h libass/ass_cache.h libass/ass_font.h libass/ass_fontconfig.h libass/ass_library.h libass/ass_mp.h libass/ass_types.h libass/ass_utils.h libass/mputils.h
diffstat 10 files changed, 30 insertions(+), 30 deletions(-) [+]
line wrap: on
line diff
--- a/libass/ass.h	Tue Jan 29 22:44:55 2008 +0000
+++ b/libass/ass.h	Tue Jan 29 23:25:11 2008 +0000
@@ -18,8 +18,8 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
-#ifndef ASS_H
-#define ASS_H
+#ifndef LIBASS_ASS_H
+#define LIBASS_ASS_H
 
 #include "ass_types.h"
 
@@ -210,4 +210,4 @@
  */
 long long ass_step_sub(ass_track_t* track, long long now, int movement);
 
-#endif /* ASS_H */
+#endif /* LIBASS_ASS_H */
--- a/libass/ass_bitmap.h	Tue Jan 29 22:44:55 2008 +0000
+++ b/libass/ass_bitmap.h	Tue Jan 29 23:25:11 2008 +0000
@@ -18,8 +18,8 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
-#ifndef ASS_BITMAP_H
-#define ASS_BITMAP_H
+#ifndef LIBASS_BITMAP_H
+#define LIBASS_BITMAP_H
 
 typedef struct ass_synth_priv_s ass_synth_priv_t;
 
@@ -45,4 +45,4 @@
 
 void ass_free_bitmap(bitmap_t* bm);
 
-#endif /* ASS_BITMAP_H */
+#endif /* LIBASS_BITMAP_H */
--- a/libass/ass_cache.h	Tue Jan 29 22:44:55 2008 +0000
+++ b/libass/ass_cache.h	Tue Jan 29 23:25:11 2008 +0000
@@ -18,8 +18,8 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
-#ifndef ASS_CACHE_H
-#define ASS_CACHE_H
+#ifndef LIBASS_CACHE_H
+#define LIBASS_CACHE_H
 
 void ass_font_cache_init(void);
 ass_font_t* ass_font_cache_find(ass_font_desc_t* desc);
@@ -94,4 +94,4 @@
 void* hashmap_insert(hashmap_t* map, void* key, void* value);
 void* hashmap_find(hashmap_t* map, void* key);
 
-#endif /* ASS_CACHE_H */
+#endif /* LIBASS_CACHE_H */
--- a/libass/ass_font.h	Tue Jan 29 22:44:55 2008 +0000
+++ b/libass/ass_font.h	Tue Jan 29 23:25:11 2008 +0000
@@ -18,8 +18,8 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
-#ifndef ASS_FONT_H
-#define ASS_FONT_H
+#ifndef LIBASS_FONT_H
+#define LIBASS_FONT_H
 
 typedef struct ass_font_desc_s {
 	char* family;
@@ -48,4 +48,4 @@
 FT_Vector ass_font_get_kerning(ass_font_t* font, uint32_t c1, uint32_t c2);
 void ass_font_free(ass_font_t* font);
 
-#endif /* ASS_FONT_H */
+#endif /* LIBASS_FONT_H */
--- a/libass/ass_fontconfig.h	Tue Jan 29 22:44:55 2008 +0000
+++ b/libass/ass_fontconfig.h	Tue Jan 29 23:25:11 2008 +0000
@@ -18,8 +18,8 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
-#ifndef ASS_FONTCONFIG_H
-#define ASS_FONTCONFIG_H
+#ifndef LIBASS_FONTCONFIG_H
+#define LIBASS_FONTCONFIG_H
 
 #ifdef HAVE_FONTCONFIG
 #include <fontconfig/fontconfig.h>
@@ -31,4 +31,4 @@
 char* fontconfig_select(fc_instance_t* priv, const char* family, unsigned bold, unsigned italic, int* index, uint32_t code);
 void fontconfig_done(fc_instance_t* priv);
 
-#endif /* ASS_FONTCONFIG_H */
+#endif /* LIBASS_FONTCONFIG_H */
--- a/libass/ass_library.h	Tue Jan 29 22:44:55 2008 +0000
+++ b/libass/ass_library.h	Tue Jan 29 23:25:11 2008 +0000
@@ -18,8 +18,8 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
-#ifndef ASS_LIBRARY_H
-#define ASS_LIBRARY_H
+#ifndef LIBASS_LIBRARY_H
+#define LIBASS_LIBRARY_H
 
 typedef struct ass_fontdata_s {
 	char* name;
@@ -36,4 +36,4 @@
 	int num_fontdata;
 };
 
-#endif /* ASS_LIBRARY_H */
+#endif /* LIBASS_LIBRARY_H */
--- a/libass/ass_mp.h	Tue Jan 29 22:44:55 2008 +0000
+++ b/libass/ass_mp.h	Tue Jan 29 23:25:11 2008 +0000
@@ -18,8 +18,8 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
-#ifndef ASS_MP_H
-#define ASS_MP_H
+#ifndef LIBASS_MP_H
+#define LIBASS_MP_H
 
 #include "subreader.h"
 
@@ -53,4 +53,4 @@
 extern int ass_force_reload;
 ass_image_t* ass_mp_render_frame(ass_renderer_t *priv, ass_track_t* track, long long now, int* detect_change);
 
-#endif /* ASS_MP_H */
+#endif /* LIBASS_MP_H */
--- a/libass/ass_types.h	Tue Jan 29 22:44:55 2008 +0000
+++ b/libass/ass_types.h	Tue Jan 29 23:25:11 2008 +0000
@@ -18,8 +18,8 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
-#ifndef ASS_TYPES_H
-#define ASS_TYPES_H
+#ifndef LIBASS_TYPES_H
+#define LIBASS_TYPES_H
 
 #define VALIGN_SUB 0
 #define VALIGN_CENTER 8
@@ -110,4 +110,4 @@
 	parser_priv_t* parser_priv;
 } ass_track_t;
 
-#endif /* ASS_TYPES_H */
+#endif /* LIBASS_TYPES_H */
--- a/libass/ass_utils.h	Tue Jan 29 22:44:55 2008 +0000
+++ b/libass/ass_utils.h	Tue Jan 29 23:25:11 2008 +0000
@@ -18,8 +18,8 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
-#ifndef ASS_UTILS_H
-#define ASS_UTILS_H
+#ifndef LIBASS_UTILS_H
+#define LIBASS_UTILS_H
 
 int mystrtoi(char** p, int base, int* res);
 int mystrtou32(char** p, int base, uint32_t* res);
@@ -57,4 +57,4 @@
 	return (int)(x * 0x10000);
 }
 
-#endif /* ASS_UTILS_H */
+#endif /* LIBASS_UTILS_H */
--- a/libass/mputils.h	Tue Jan 29 22:44:55 2008 +0000
+++ b/libass/mputils.h	Tue Jan 29 23:25:11 2008 +0000
@@ -1,5 +1,5 @@
-#ifndef MPUTILS_H
-#define MPUTILS_H
+#ifndef LIBASS_MPUTILS_H
+#define LIBASS_MPUTILS_H
 
 #include "mp_msg.h"
 #include "help_mp.h"
@@ -8,4 +8,4 @@
 #include "libvo/sub.h" // for utf8_get_char
 #include "libavutil/common.h"
 
-#endif /* MPUTILS_H */
+#endif /* LIBASS_MPUTILS_H */