summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libass/ass.c6
-rw-r--r--libass/ass.h2
-rw-r--r--libass/ass_mp.c2
-rw-r--r--libass/ass_mp.h3
4 files changed, 7 insertions, 6 deletions
diff --git a/libass/ass.c b/libass/ass.c
index d65bf3dab6..370063aacf 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 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 @@ 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");
}
- ass_process_force_style(track);
+ 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;
}
- ass_process_force_style(track);
+ process_force_style(track);
return track;
}
diff --git a/libass/ass.h b/libass/ass.h
index 6d5cb63d74..12f16fef5d 100644
--- a/libass/ass.h
+++ b/libass/ass.h
@@ -147,8 +147,6 @@ 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 290f383786..64b47e1d80 100644
--- a/libass/ass_mp.c
+++ b/libass/ass_mp.c
@@ -118,7 +118,7 @@ ass_track_t* ass_default_track(ass_library_t* library) {
style->ScaleY = 1.;
}
- ass_process_force_style(track);
+ process_force_style(track);
return track;
}
diff --git a/libass/ass_mp.h b/libass/ass_mp.h
index 47c683c5fd..74fc869c2e 100644
--- a/libass/ass_mp.h
+++ b/libass/ass_mp.h
@@ -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;