diff options
author | wm4 <wm4@nowhere> | 2014-10-28 19:48:56 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-10-28 20:30:12 +0100 |
commit | 0c71ae0528a6143995697fb02023c3180ee44c18 (patch) | |
tree | c985d1192725908c4a280e37ea75ed976adb1b05 /player | |
parent | 65db3291b327797ac7d09ba2ea36db9ba5383f18 (diff) | |
download | mpv-0c71ae0528a6143995697fb02023c3180ee44c18.tar.bz2 mpv-0c71ae0528a6143995697fb02023c3180ee44c18.tar.xz |
player: handle DVB demuxer reloading correctly
This was probably done incorrectly in cases when the currently selected
channel had no data. I'm not sure if this codepath is functional at all,
though. Maybe not.
Untested due to lack of DVB hardware.
Diffstat (limited to 'player')
-rw-r--r-- | player/loadfile.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/player/loadfile.c b/player/loadfile.c index 46f41644c1..440b29d6a9 100644 --- a/player/loadfile.c +++ b/player/loadfile.c @@ -1135,6 +1135,8 @@ goto_reopen_demuxer: ; MP_VERBOSE(mpctx, "EOF code: %d \n", mpctx->stop_play); +terminate_playback: + if (mpctx->stop_play == PT_RELOAD_DEMUXER) { mpctx->stop_play = KEEP_PLAYING; mpctx->playback_initialized = false; @@ -1145,8 +1147,6 @@ goto_reopen_demuxer: ; goto goto_reopen_demuxer; } -terminate_playback: - mp_nav_destroy(mpctx); if (mpctx->stop_play == KEEP_PLAYING) |