From ba7cc071068f4f57ae354e77f64552712fda6855 Mon Sep 17 00:00:00 2001
From: rcombs <rcombs@rcombs.me>
Date: Thu, 27 May 2021 00:56:41 -0500
Subject: sub: rewrite auto-forced-only support

- No longer has a fake "option" used only internally (which didn't always get propagated properly)
- Always overrideable during playback
---
 sub/sd_lavc.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'sub/sd_lavc.c')

diff --git a/sub/sd_lavc.c b/sub/sd_lavc.c
index 1f7bf76fce..50d3f2bceb 100644
--- a/sub/sd_lavc.c
+++ b/sub/sd_lavc.c
@@ -195,7 +195,8 @@ static void read_sub_bitmaps(struct sd *sd, struct sub *sub)
             MP_ERR(sd, "unsupported subtitle type from libavcodec\n");
             continue;
         }
-        if (!(r->flags & AV_SUBTITLE_FLAG_FORCED) && opts->forced_subs_only_current)
+        if (!(r->flags & AV_SUBTITLE_FLAG_FORCED) && (opts->forced_subs_only == 1 ||
+            (opts->forced_subs_only && sd->forced_only_def)))
             continue;
         if (r->w <= 0 || r->h <= 0)
             continue;
-- 
cgit v1.2.3