[MPlayer-cvslog] r30108 - in trunk/libass: ass.c ass.h ass_mp.c ass_mp.h

[reimar]

Author: reimar
Date: Thu Dec 24 11:56:25 2009
New Revision: 30108

Log:
Revert renaming of process_force_style to restore compilation against
Ubuntu's libass.

Modified:
   trunk/libass/ass.c
   trunk/libass/ass.h
   trunk/libass/ass_mp.c
   trunk/libass/ass_mp.h

Modified: trunk/libass/ass.c
==============================================================================
--- trunk/libass/ass.c	Thu Dec 24 11:51:24 2009	(r30107)
+++ trunk/libass/ass.c	Thu Dec 24 11:56:25 2009	(r30108)
@@ -331,7 +331,7 @@ static int process_event_tail(ass_track_
  * \param track track to apply overrides to
  * The format for overrides is [StyleName.]Field=Value
  */
-void ass_process_force_style(ass_track_t* track) {
+void process_force_style(ass_track_t* track) {
 	char **fs, *eq, *dt, *style, *tname, *token;
 	ass_style_t* target;
 	int sid;
@@ -766,7 +766,7 @@ void ass_process_codec_private(ass_track
 			track->event_format = strdup("Format: Layer, Start, End, Style, Actor, MarginL, MarginR, MarginV, Effect, Text");
 	}
 
-	ass_process_force_style(track);
+	process_force_style(track);
 }
 
 static int check_duplicate_event(ass_track_t* track, int ReadOrder)
@@ -993,7 +993,7 @@ static ass_track_t* parse_memory(ass_lib
 		return 0;
 	}
 
-	ass_process_force_style(track);
+	process_force_style(track);
 
 	return track;
 }

Modified: trunk/libass/ass.h
==============================================================================
--- trunk/libass/ass.h	Thu Dec 24 11:51:24 2009	(r30107)
+++ trunk/libass/ass.h	Thu Dec 24 11:56:25 2009	(r30108)
@@ -147,8 +147,6 @@ int ass_alloc_event(ass_track_t* track);
  */
 void ass_free_style(ass_track_t* track, int sid);
 
-void ass_process_force_style(ass_track_t* track);
-
 /**
  * \brief delete an event
  * \param track track

Modified: trunk/libass/ass_mp.c
==============================================================================
--- trunk/libass/ass_mp.c	Thu Dec 24 11:51:24 2009	(r30107)
+++ trunk/libass/ass_mp.c	Thu Dec 24 11:56:25 2009	(r30108)
@@ -118,7 +118,7 @@ ass_track_t* ass_default_track(ass_libra
 		style->ScaleY = 1.;
 	}
 
-	ass_process_force_style(track);
+	process_force_style(track);
 	return track;
 }
 

Modified: trunk/libass/ass_mp.h
==============================================================================
--- trunk/libass/ass_mp.h	Thu Dec 24 11:51:24 2009	(r30107)
+++ trunk/libass/ass_mp.h	Thu Dec 24 11:56:25 2009	(r30108)
@@ -37,6 +37,9 @@
 #define ass_image_t ASS_Image
 #define ass_style_t ASS_Style
 #define ass_event_t ASS_Event
+#define process_force_style(t) ass_process_force_style(t)
+#else
+void process_force_style(ass_track_t* track);
 #endif
 
 extern ass_library_t* ass_library;