RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-18 13:47:04 +00:00
Code Issues Releases Wiki Activity

player: fix quvi 0.9 playlist loading

Browse Source 
The code made no sense at all.

Conflicts:
	mpvcore/player/loadfile.c
This commit is contained in:
wm4 2013-11-03 19:22:13 +01:00
parent 391c087d75
commit e68fcbfa39
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mpvcore/mplayer.c
View File

@ -4355,8 +4355,9 @@ static void stream_dump(struct MPContext *mpctx)
// from the given playlist pl, so the entries don't actually need to be copied.
static void transfer_playlist(struct MPContext *mpctx, struct playlist *pl)
{
if (mpctx->demuxer->playlist->first) {
playlist_transfer_entries(mpctx->playlist, mpctx->demuxer->playlist);
if (pl->first) {
playlist_transfer_entries(mpctx->playlist, pl);
// current entry is replaced
if (mpctx->playlist->current)
playlist_remove(mpctx->playlist, mpctx->playlist->current);
} else {