From 0c1544e66cb980bd8a1dedb13ac07904380da608 Mon Sep 17 00:00:00 2001 From: rcombs Date: Sun, 27 Jun 2021 01:30:24 -0500 Subject: sub: fix subs/lyrics on music files with sub-past-video-end=no Regressed in 11423acf3 --- player/sub.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'player/sub.c') diff --git a/player/sub.c b/player/sub.c index 49bae790de..148109bdc9 100644 --- a/player/sub.c +++ b/player/sub.c @@ -115,7 +115,9 @@ static bool update_subtitle(struct MPContext *mpctx, double video_pts, // quite different, because normally subtitles are redrawn on new video // frames, using the video frames' timestamps. if (mpctx->video_out && mpctx->video_status == STATUS_EOF && - mpctx->opts->subs_rend->sub_past_video_end) { + (mpctx->opts->subs_rend->sub_past_video_end || + !mpctx->current_track[0][STREAM_VIDEO] || + mpctx->current_track[0][STREAM_VIDEO]->attached_picture)) { if (osd_get_force_video_pts(mpctx->osd) != video_pts) { osd_set_force_video_pts(mpctx->osd, video_pts); osd_query_and_reset_want_redraw(mpctx->osd); -- cgit v1.2.3