RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-08 15:18:00 +00:00
Code Issues Releases Wiki Activity

player: fix crash wtih --secondary-sid

Browse Source 
Fises #1463.
This commit is contained in:
wm4 2015-01-13 02:44:08 +01:00
parent 794804725d
commit b2cc0fb1ae
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
player/sub.c
View File

@ -199,17 +199,18 @@ void update_osd_sub_state(struct MPContext *mpctx, int order,
struct track *track = mpctx->current_track[order][STREAM_SUB]; struct track *track = mpctx->current_track[order][STREAM_SUB];
struct dec_sub *dec_sub = mpctx->d_sub[order]; struct dec_sub *dec_sub = mpctx->d_sub[order];
int obj = order ? OSDTYPE_SUB2 : OSDTYPE_SUB; int obj = order ? OSDTYPE_SUB2 : OSDTYPE_SUB;
bool textsub = dec_sub && sub_has_get_text(dec_sub);
struct osd_sub_state state = { struct osd_sub_state state = {
.dec_sub = dec_sub, .dec_sub = dec_sub,
// Decides whether to use OSD path or normal subtitle rendering path. // Decides whether to use OSD path or normal subtitle rendering path.
.render_bitmap_subs = opts->ass_enabled || !sub_has_get_text(dec_sub), .render_bitmap_subs = opts->ass_enabled || !textsub,
.video_offset = get_track_video_offset(mpctx, track), .video_offset = get_track_video_offset(mpctx, track),
}; };
// Secondary subs are rendered with the "text" renderer to transform them // Secondary subs are rendered with the "text" renderer to transform them
// to toptitles. // to toptitles.
if (order == 1 && sub_has_get_text(dec_sub)) if (order == 1 && textsub)
state.render_bitmap_subs = false; state.render_bitmap_subs = false;
if (!mpctx->current_track[0][STREAM_VIDEO]) if (!mpctx->current_track[0][STREAM_VIDEO])