diff options
| author | wm4 <wm4@nowhere> | 2013-11-17 14:35:20 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-12-01 19:26:17 +0100 |
| commit | b24fd52268e4e01515aa09b244c4762719dcf316 (patch) | |
| tree | da602b36a35b467f4d36734c19412f85095368f7 | |
| parent | dd25c08713fca3907e75e1a192a77b0796f97638 (diff) | |
| download | mpv-b24fd52268e4e01515aa09b244c4762719dcf316.tar.bz2 mpv-b24fd52268e4e01515aa09b244c4762719dcf316.tar.xz | |
player: don't remove playback status when reinitializing DVB
Also break that line a bit.
Conflicts:
mpvcore/player/loadfile.c
| -rw-r--r-- | mpvcore/mplayer.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mpvcore/mplayer.c b/mpvcore/mplayer.c index a4bfb3ea0c..23b86f6945 100644 --- a/mpvcore/mplayer.c +++ b/mpvcore/mplayer.c @@ -4674,7 +4674,9 @@ goto_reopen_demuxer: ; #ifdef CONFIG_DVBIN if (mpctx->dvbin_reopen) { mpctx->stop_play = 0; - uninit_player(mpctx, INITIALIZED_ALL - (INITIALIZED_STREAM | INITIALIZED_GETCH2 | (opts->fixed_vo ? INITIALIZED_VO : 0))); + uninit_player(mpctx, INITIALIZED_ALL - + (INITIALIZED_PLAYBACK | INITIALIZED_STREAM | INITIALIZED_GETCH2 | + (opts->fixed_vo ? INITIALIZED_VO : 0))); mpctx->dvbin_reopen = 0; goto goto_reopen_demuxer; } |