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

player: don't cache subtitles across deselection

Browse Source 
This means reselection triggers full reinit. This is better if you have
options that "edit" subtitles or whatever.
This commit is contained in:
wm4 2018-06-30 17:15:29 +02:00
parent 4d6d3a3455
commit 99afa8d51b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
player/loadfile.c
View File

@ -211,13 +211,11 @@ static void uninit_demuxer(struct MPContext *mpctx)
for (int i = 0; i < mpctx->num_tracks; i++) {
struct track *track = mpctx->tracks[i];
assert(!track->dec);
assert(!track->dec && !track->d_sub);
assert(!track->vo_c && !track->ao_c);
assert(!track->sink);
assert(!track->remux_sink);
sub_destroy(track->d_sub);
// Demuxers can be added in any order (if they appear mid-stream), and
// we can't know which tracks uses which, so here's some O(n^2) trash.
for (int n = 0; n < num_demuxers; n++) {
@ -681,8 +679,6 @@ bool mp_remove_track(struct MPContext *mpctx, struct track *track)
struct demuxer *d = track->demuxer;
sub_destroy(track->d_sub);
if (mpctx->seek_slave == track)
mpctx->seek_slave = NULL;

6
player/sub.c
View File

@ -70,6 +70,8 @@ void uninit_sub(struct MPContext *mpctx, struct track *track)
sub_select(track->d_sub, false);
int order = get_order(mpctx, track);
osd_set_sub(mpctx->osd, order, NULL);
sub_destroy(track->d_sub);
track->d_sub = NULL;
}
}
@ -182,7 +184,9 @@ void reinit_sub(struct MPContext *mpctx, struct track *track)
if (!track || !track->stream || track->stream->type != STREAM_SUB)
return;
if (!track->d_sub && !init_subdec(mpctx, track)) {
assert(!track->d_sub);
if (!init_subdec(mpctx, track)) {
error_on_track(mpctx, track);
return;
}