Mercurial > mplayer.hg
changeset 30066:a2e4fd61dc4a
Revert renaming of process_force_style to restore compilation against
Ubuntu's libass.
| author | reimar |
|---|---|
| date | Thu, 24 Dec 2009 10:56:25 +0000 |
| parents | d5d20b8256b7 |
| children | 1957c654b56d |
| files | libass/ass.c libass/ass.h libass/ass_mp.c libass/ass_mp.h |
| diffstat | 4 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/libass/ass.c Thu Dec 24 10:51:24 2009 +0000 +++ b/libass/ass.c Thu Dec 24 10:56:25 2009 +0000 @@ -331,7 +331,7 @@ * \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 @@ 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 @@ return 0; } - ass_process_force_style(track); + process_force_style(track); return track; }
--- a/libass/ass.h Thu Dec 24 10:51:24 2009 +0000 +++ b/libass/ass.h Thu Dec 24 10:56:25 2009 +0000 @@ -147,8 +147,6 @@ */ 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:51:24 2009 +0000 +++ b/libass/ass_mp.c Thu Dec 24 10:56:25 2009 +0000 @@ -118,7 +118,7 @@ style->ScaleY = 1.; } - ass_process_force_style(track); + process_force_style(track); return track; }
--- a/libass/ass_mp.h Thu Dec 24 10:51:24 2009 +0000 +++ b/libass/ass_mp.h Thu Dec 24 10:56:25 2009 +0000 @@ -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;