From b24fd52268e4e01515aa09b244c4762719dcf316 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sun, 17 Nov 2013 14:35:20 +0100
Subject: player: don't remove playback status when reinitializing DVB

Also break that line a bit.

Conflicts:
	mpvcore/player/loadfile.c
---
 mpvcore/mplayer.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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;
     }
-- 
cgit v1.2.3