diff options
| author | dyphire <qimoge@gmail.com> | 2023-12-18 03:18:11 +0800 |
|---|---|---|
| committer | Dudemanguy <random342@airmail.cc> | 2023-12-18 14:58:34 +0000 |
| commit | b563b2aed0aaca7a51ffe40e0e923c00fd77de46 (patch) | |
| tree | 556f5cf4ffd7581df3f187895e1558d88d3398a2 /sub/sd_lavc.c | |
| parent | 702b3eb956a23b73e0f23763fea6cebed004cb44 (diff) | |
| download | mpv-b563b2aed0aaca7a51ffe40e0e923c00fd77de46.tar.bz2 mpv-b563b2aed0aaca7a51ffe40e0e923c00fd77de46.tar.xz | |
options: add --secondary-sub-ass-override
Default: strip. preserve the old behavior
Diffstat (limited to 'sub/sd_lavc.c')
| -rw-r--r-- | sub/sd_lavc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sub/sd_lavc.c b/sub/sd_lavc.c index 4f43a1d6d8..8e3c3ed665 100644 --- a/sub/sd_lavc.c +++ b/sub/sd_lavc.c @@ -399,7 +399,7 @@ static struct sub *get_current(struct sd_lavc_priv *priv, double pts) } static struct sub_bitmaps *get_bitmaps(struct sd *sd, struct mp_osd_res d, - int format, double pts, int order) + int format, double pts) { struct sd_lavc_priv *priv = sd->priv; struct mp_subtitle_opts *opts = sd->opts; @@ -451,7 +451,7 @@ static struct sub_bitmaps *get_bitmaps(struct sd *sd, struct mp_osd_res d, h = MPMAX(priv->video_params.h, current->src_h); } - if (shared_opts->sub_pos[0] != 100.0f && opts->ass_style_override) { + if (shared_opts->sub_pos[0] != 100.0f && shared_opts->ass_style_override[0]) { float offset = (100.0f - shared_opts->sub_pos[0]) / 100.0f * h; for (int n = 0; n < res->num_parts; n++) { @@ -470,7 +470,7 @@ static struct sub_bitmaps *get_bitmaps(struct sd *sd, struct mp_osd_res d, osd_rescale_bitmaps(res, w, h, d, video_par); - if (opts->sub_scale != 1.0 && opts->ass_style_override) { + if (opts->sub_scale != 1.0 && shared_opts->ass_style_override[0]) { for (int n = 0; n < res->num_parts; n++) { struct sub_bitmap *sub = &res->parts[n]; |