From 42b40d03f144a4f6eefbfc9898ff157284befc83 Mon Sep 17 00:00:00 2001 From: nanahi <130121847+na-na-hi@users.noreply.github.com> Date: Sun, 15 Sep 2024 01:25:07 -0400 Subject: [PATCH] player/main: revert msg uninit order changes msg must be the last module to uninit since pretty much everything else uses logging. This reverts commit f92d5da89cf0b025f1bee1801e66911fe1efb6ff. This reverts commit c1282d4d43be8fb8bbc8529b22804d288d59038a. --- player/main.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/player/main.c b/player/main.c index fcb2ae4ec7..c6a78dfe31 100644 --- a/player/main.c +++ b/player/main.c @@ -187,10 +187,6 @@ void mp_destroy(struct MPContext *mpctx) cocoa_set_input_context(NULL); #endif - uninit_libav(mpctx->global); - - mp_msg_uninit(mpctx->global); - if (cas_terminal_owner(mpctx, mpctx)) { terminal_uninit(); cas_terminal_owner(mpctx, NULL); @@ -198,6 +194,9 @@ void mp_destroy(struct MPContext *mpctx) mp_input_uninit(mpctx->input); + uninit_libav(mpctx->global); + + mp_msg_uninit(mpctx->global); assert(!mpctx->num_abort_list); talloc_free(mpctx->abort_list); mp_mutex_destroy(&mpctx->abort_lock);