summaryrefslogtreecommitdiffstats
path: root/sub
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-03-15 01:54:55 +0100
committerwm4 <wm4@nowhere>2017-03-15 01:54:55 +0100
commit9a23a14cec99adf734a46d3f533b1f200328a214 (patch)
tree670c2b317c5d0161bbaf7f9e9310dc9ec1bf2158 /sub
parent77cbb35437ccf8904cc76475868d20bd2f1751fd (diff)
downloadmpv-9a23a14cec99adf734a46d3f533b1f200328a214.tar.bz2
mpv-9a23a14cec99adf734a46d3f533b1f200328a214.tar.xz
sd_ass: disable --sub-fix-timing if sub style override is fully disabled
This means the subtitles will show as "intended". For some weird reason, --sub-ass-style-override is the option that controls style override, which implies it's specific to ASS. While that seems weird and doesn't always reflect reality, I don't care about that now.
Diffstat (limited to 'sub')
-rw-r--r--sub/sd_ass.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sub/sd_ass.c b/sub/sd_ass.c
index 9b4d3763c5..2d16afd821 100644
--- a/sub/sd_ass.c
+++ b/sub/sd_ass.c
@@ -371,7 +371,7 @@ static long long find_timestamp(struct sd *sd, double pts)
long long ts = llrint(pts * 1000);
- if (!sd->opts->sub_fix_timing)
+ if (!sd->opts->sub_fix_timing || sd->opts->ass_style_override == 0)
return ts;
// Try to fix small gaps and overlaps.