RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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 f92d5da89c.
This reverts commit c1282d4d43.
This commit is contained in:
nanahi 2024-09-15 01:25:07 -04:00 committed by Kacper Michajłow
parent 429e379c7f
commit 42b40d03f1
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
player/main.c
View File

@ -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);