RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

player: fix removing external tracks at runtime 

This could make the player crash on exit if the "sub_reload" command was
used successfully. the reason was that the mpctx->sources array could
have dangling pointers to the unloaded demuxers.

Also fix a memory leak by actually always freeing the per-stream
subtitle decoders (which are a hack to make ordered chapters behave
better).

(cherry picked from commit 4d2ed847ce)
This commit is contained in:
wm4 2015-04-27 22:28:35 +02:00 committed by Diogo Franco (Kovensky)
parent 62a66e2ff8
commit a8c764acb4
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
player/loadfile.c
View File

@ -653,8 +653,16 @@ bool mp_remove_track(struct MPContext *mpctx, struct track *track)
for (int n = mpctx->num_tracks - 1; n >= 0 && !in_use; n--)
in_use |= mpctx->tracks[n]->demuxer == d;
if (!in_use)
if (!in_use) {
for (int n = 0; n < mpctx->num_sources; n++) {
if (mpctx->sources[n] == d) {
MP_TARRAY_REMOVE_AT(mpctx->sources, mpctx->num_sources, n);
break;
}
}
uninit_stream_sub_decoders(d);
free_demuxer_and_stream(d);
}
mp_notify(mpctx, MPV_EVENT_TRACKS_CHANGED, NULL);