summaryrefslogtreecommitdiffstats
path: root/sub/dec_sub.c
diff options
context:
space:
mode:
authordyphire <qimoge@gmail.com>2023-12-18 03:18:11 +0800
committerDudemanguy <random342@airmail.cc>2023-12-18 14:58:34 +0000
commitb563b2aed0aaca7a51ffe40e0e923c00fd77de46 (patch)
tree556f5cf4ffd7581df3f187895e1558d88d3398a2 /sub/dec_sub.c
parent702b3eb956a23b73e0f23763fea6cebed004cb44 (diff)
downloadmpv-b563b2aed0aaca7a51ffe40e0e923c00fd77de46.tar.bz2
mpv-b563b2aed0aaca7a51ffe40e0e923c00fd77de46.tar.xz
options: add --secondary-sub-ass-override
Default: strip. preserve the old behavior
Diffstat (limited to 'sub/dec_sub.c')
-rw-r--r--sub/dec_sub.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sub/dec_sub.c b/sub/dec_sub.c
index 6ad26cba6a..c993b047a1 100644
--- a/sub/dec_sub.c
+++ b/sub/dec_sub.c
@@ -144,6 +144,7 @@ static struct sd *init_decoder(struct dec_sub *sub)
.opts = sub->opts,
.shared_opts = sub->shared_opts,
.driver = driver,
+ .order = sub->order,
.attachments = sub->attachments,
.codec = sub->codec,
.preload_ok = true,
@@ -368,7 +369,7 @@ struct sub_bitmaps *sub_get_bitmaps(struct dec_sub *sub, struct mp_osd_res dim,
if (!(sub->end != MP_NOPTS_VALUE && pts >= sub->end) &&
sub->sd->driver->get_bitmaps)
- res = sub->sd->driver->get_bitmaps(sub->sd, dim, format, pts, sub->order);
+ res = sub->sd->driver->get_bitmaps(sub->sd, dim, format, pts);
mp_mutex_unlock(&sub->lock);
return res;