Mercurial > mplayer.hg
changeset 30064:73a32da1ef18
rename process_force_style to ass_process_force_style to match the API
as newer libass versions.
| author | reimar |
|---|---|
| date | Thu, 24 Dec 2009 10:45:05 +0000 |
| parents | 3a3370c00ba6 |
| children | d5d20b8256b7 |
| files | libass/ass.c libass/ass.h libass/ass_mp.c |
| diffstat | 3 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/libass/ass.c Thu Dec 24 10:26:29 2009 +0000 +++ b/libass/ass.c Thu Dec 24 10:45:05 2009 +0000 @@ -331,7 +331,7 @@ * \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 @@ 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 @@ return 0; } - process_force_style(track); + ass_process_force_style(track); return track; }
--- a/libass/ass.h Thu Dec 24 10:26:29 2009 +0000 +++ b/libass/ass.h Thu Dec 24 10:45:05 2009 +0000 @@ -147,6 +147,8 @@ */ 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
--- a/libass/ass_mp.c Thu Dec 24 10:26:29 2009 +0000 +++ b/libass/ass_mp.c Thu Dec 24 10:45:05 2009 +0000 @@ -71,8 +71,6 @@ 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 @@ style->ScaleY = 1.; } - process_force_style(track); + ass_process_force_style(track); return track; }