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

[reimar]

Author: reimar
Date: Thu Dec 24 11:45:05 2009
New Revision: 30106

Log:
rename process_force_style to ass_process_force_style to match the API
as newer libass versions.

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

Modified: trunk/libass/ass.c
==============================================================================
--- trunk/libass/ass.c	Thu Dec 24 11:26:29 2009	(r30105)
+++ trunk/libass/ass.c	Thu Dec 24 11:45:05 2009	(r30106)
@@ -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 process_force_style(ass_track_t* track) {
+void ass_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");
 	}
 
-	process_force_style(track);
+	ass_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;
 	}
 
-	process_force_style(track);
+	ass_process_force_style(track);
 
 	return track;
 }

Modified: trunk/libass/ass.h
==============================================================================
--- trunk/libass/ass.h	Thu Dec 24 11:26:29 2009	(r30105)
+++ trunk/libass/ass.h	Thu Dec 24 11:45:05 2009	(r30106)
@@ -147,6 +147,8 @@ 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:26:29 2009	(r30105)
+++ trunk/libass/ass_mp.c	Thu Dec 24 11:45:05 2009	(r30106)
@@ -71,8 +71,6 @@ extern char* sub_cp;
 static char* sub_cp = 0;
 #endif
 
-void process_force_style(ass_track_t* track);
-
 ass_track_t* ass_default_track(ass_library_t* library) {
 	ass_track_t* track = ass_new_track(library);
 
@@ -123,7 +121,7 @@ ass_track_t* ass_default_track(ass_libra
 		style->ScaleY = 1.;
 	}
 
-	process_force_style(track);
+	ass_process_force_style(track);
 	return track;
 }