mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 03:52:22 +02:00
Code

sub: reset sub decoder correctly when cycling subtitles

Browse Source 
reset_subtitles() works in mpctx->d_sub[], which is set to NULL before
calling it from uninit_sub(). This fixes resetting the subtitle when
cycling subtitle tracks.

Actually, this was probably a feature, because it's annoying if
subtitles don't show up when cycling them. But it also can have
unintended consequences, so get rid of it.
This commit is contained in:
wm4 2014-12-21 23:48:20 +01:00
parent dc0b0cdeb0
commit 49d01d81e0
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
player/sub.c
View File

@ -161,10 +161,8 @@ void uninit_stream_sub_decoders(struct demuxer *demuxer)
void uninit_sub(struct MPContext *mpctx, int order)
{
if (mpctx->d_sub[order]) {
mpctx->d_sub[order] = NULL; // Note: not free'd.
int obj = order ? OSDTYPE_SUB2 : OSDTYPE_SUB;
osd_set_sub(mpctx->osd, obj, NULL);
reset_subtitles(mpctx, order);
mpctx->d_sub[order] = NULL; // Note: not free'd.
reselect_demux_streams(mpctx);
}
}