summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-10-19 22:34:00 +0200
committerwm4 <wm4@nowhere>2014-10-19 22:34:37 +0200
commit2f559ac70b63141545992e934cc41941cf658b0e (patch)
treead73173555917c7a38ab1614ac427d763a9a7561
parent2cd25891b67d4fb5c5afcad2bf0a6187b2b03b23 (diff)
downloadmpv-2f559ac70b63141545992e934cc41941cf658b0e.tar.bz2
mpv-2f559ac70b63141545992e934cc41941cf658b0e.tar.xz
player: shutdown all clients before actual uninit
This seems safer. It might be possible that commands sent by the clients could recreate e.g. audio or video outputs.
-rw-r--r--player/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/player/main.c b/player/main.c
index b54b59674b..90841f5fdf 100644
--- a/player/main.c
+++ b/player/main.c
@@ -119,6 +119,8 @@ static void shutdown_clients(struct MPContext *mpctx)
void mp_destroy(struct MPContext *mpctx)
{
+ shutdown_clients(mpctx);
+
uninit_audio_out(mpctx);
uninit_video_out(mpctx);
@@ -129,8 +131,6 @@ void mp_destroy(struct MPContext *mpctx)
mpctx->encode_lavc_ctx = NULL;
- shutdown_clients(mpctx);
-
#if !defined(__MINGW32__)
mp_uninit_ipc(mpctx->ipc_ctx);
mpctx->ipc_ctx = NULL;