Mercurial > mplayer.hg
comparison libass/ass.c @ 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 | 73a32da1ef18 |
children | 48d020c5ceca |
comparison
equal
deleted
inserted
replaced
30065:d5d20b8256b7 | 30066:a2e4fd61dc4a |
---|---|
329 /** | 329 /** |
330 * \brief Parse command line style overrides (--ass-force-style option) | 330 * \brief Parse command line style overrides (--ass-force-style option) |
331 * \param track track to apply overrides to | 331 * \param track track to apply overrides to |
332 * The format for overrides is [StyleName.]Field=Value | 332 * The format for overrides is [StyleName.]Field=Value |
333 */ | 333 */ |
334 void ass_process_force_style(ass_track_t* track) { | 334 void process_force_style(ass_track_t* track) { |
335 char **fs, *eq, *dt, *style, *tname, *token; | 335 char **fs, *eq, *dt, *style, *tname, *token; |
336 ass_style_t* target; | 336 ass_style_t* target; |
337 int sid; | 337 int sid; |
338 char** list = track->library->style_overrides; | 338 char** list = track->library->style_overrides; |
339 | 339 |
764 track->event_format = strdup("Format: Marked, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text"); | 764 track->event_format = strdup("Format: Marked, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text"); |
765 else | 765 else |
766 track->event_format = strdup("Format: Layer, Start, End, Style, Actor, MarginL, MarginR, MarginV, Effect, Text"); | 766 track->event_format = strdup("Format: Layer, Start, End, Style, Actor, MarginL, MarginR, MarginV, Effect, Text"); |
767 } | 767 } |
768 | 768 |
769 ass_process_force_style(track); | 769 process_force_style(track); |
770 } | 770 } |
771 | 771 |
772 static int check_duplicate_event(ass_track_t* track, int ReadOrder) | 772 static int check_duplicate_event(ass_track_t* track, int ReadOrder) |
773 { | 773 { |
774 int i; | 774 int i; |
991 if (track->track_type == TRACK_TYPE_UNKNOWN) { | 991 if (track->track_type == TRACK_TYPE_UNKNOWN) { |
992 ass_free_track(track); | 992 ass_free_track(track); |
993 return 0; | 993 return 0; |
994 } | 994 } |
995 | 995 |
996 ass_process_force_style(track); | 996 process_force_style(track); |
997 | 997 |
998 return track; | 998 return track; |
999 } | 999 } |
1000 | 1000 |
1001 /** | 1001 /** |