From 9a23a14cec99adf734a46d3f533b1f200328a214 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Wed, 15 Mar 2017 01:54:55 +0100
Subject: 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.
---
 sub/sd_ass.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sub')

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.
-- 
cgit v1.2.3