summaryrefslogtreecommitdiffstats
path: root/libass
diff options
context:
space:
mode:
authoreugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-08-29 10:35:58 +0000
committereugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-08-29 10:35:58 +0000
commit1d9317f8d54f2112a68a4f888b13d28b3dc02f5e (patch)
treea994dcdd5b5fb5b3a34ee58b8ca66ce10677c49c /libass
parenta6e49255a6aaca80cdf73eba9e8e36168b3b6039 (diff)
downloadmpv-1d9317f8d54f2112a68a4f888b13d28b3dc02f5e.tar.bz2
mpv-1d9317f8d54f2112a68a4f888b13d28b3dc02f5e.tar.xz
Apply -ass-force-style also to tracks generated from subdata.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19590 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libass')
-rw-r--r--libass/ass.c2
-rw-r--r--libass/ass_mp.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/libass/ass.c b/libass/ass.c
index ab4a22b7be..0a6c027eeb 100644
--- a/libass/ass.c
+++ b/libass/ass.c
@@ -313,7 +313,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
*/
-static void 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;
diff --git a/libass/ass_mp.c b/libass/ass_mp.c
index 52cd8c3d1d..1d5061dfec 100644
--- a/libass/ass_mp.c
+++ b/libass/ass_mp.c
@@ -21,6 +21,7 @@ extern float text_font_scale_factor;
extern int subtitle_autoscale;
extern double ass_internal_font_size_coeff;
+extern void process_force_style(ass_track_t* track);
/**
* \brief Convert subdata to ass_track
@@ -107,6 +108,7 @@ ass_track_t* ass_read_subdata(sub_data* subdata, double fps) {
p--; // remove last ' '
*p = 0;
}
+ process_force_style(track);
return track;
}