diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-12-24 10:45:05 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-12-24 10:45:05 +0000 |
| commit | 1414f844c565a5c0170bb7250eafbd84ffdb93c6 (patch) | |
| tree | 5624326bef0f12360e446a3663fff57d48f17c29 | |
| parent | 2908957147cd336e16da6bbe28c461abbb2df38f (diff) | |
| download | mpv-1414f844c565a5c0170bb7250eafbd84ffdb93c6.tar.bz2 mpv-1414f844c565a5c0170bb7250eafbd84ffdb93c6.tar.xz | |
rename process_force_style to ass_process_force_style to match the API
as newer libass versions.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30106 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | libass/ass.c | 6 | ||||
| -rw-r--r-- | libass/ass.h | 2 | ||||
| -rw-r--r-- | libass/ass_mp.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/libass/ass.c b/libass/ass.c index 370063aacf..d65bf3dab6 100644 --- a/libass/ass.c +++ b/libass/ass.c @@ -331,7 +331,7 @@ static int process_event_tail(ass_track_t* track, ass_event_t* event, char* str, * \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_t* track, char *data, int size) 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_library_t* library, char* buf) return 0; } - process_force_style(track); + ass_process_force_style(track); return track; } diff --git a/libass/ass.h b/libass/ass.h index 12f16fef5d..6d5cb63d74 100644 --- a/libass/ass.h +++ b/libass/ass.h @@ -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 diff --git a/libass/ass_mp.c b/libass/ass_mp.c index b3c78b60ac..3e56ccb295 100644 --- a/libass/ass_mp.c +++ b/libass/ass_mp.c @@ -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_library_t* library) { style->ScaleY = 1.; } - process_force_style(track); + ass_process_force_style(track); return track; } |