mirror of
https://github.com/mpv-player/mpv.git
synced 2024-09-20 03:52:22 +02:00
player/main: revert msg uninit order changes
msg must be the last module to uninit since pretty much everything else uses logging. This reverts commitf92d5da89c
. This reverts commitc1282d4d43
.
This commit is contained in:
parent
429e379c7f
commit
42b40d03f1
@ -187,10 +187,6 @@ void mp_destroy(struct MPContext *mpctx)
|
|||||||
cocoa_set_input_context(NULL);
|
cocoa_set_input_context(NULL);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
uninit_libav(mpctx->global);
|
|
||||||
|
|
||||||
mp_msg_uninit(mpctx->global);
|
|
||||||
|
|
||||||
if (cas_terminal_owner(mpctx, mpctx)) {
|
if (cas_terminal_owner(mpctx, mpctx)) {
|
||||||
terminal_uninit();
|
terminal_uninit();
|
||||||
cas_terminal_owner(mpctx, NULL);
|
cas_terminal_owner(mpctx, NULL);
|
||||||
@ -198,6 +194,9 @@ void mp_destroy(struct MPContext *mpctx)
|
|||||||
|
|
||||||
mp_input_uninit(mpctx->input);
|
mp_input_uninit(mpctx->input);
|
||||||
|
|
||||||
|
uninit_libav(mpctx->global);
|
||||||
|
|
||||||
|
mp_msg_uninit(mpctx->global);
|
||||||
assert(!mpctx->num_abort_list);
|
assert(!mpctx->num_abort_list);
|
||||||
talloc_free(mpctx->abort_list);
|
talloc_free(mpctx->abort_list);
|
||||||
mp_mutex_destroy(&mpctx->abort_lock);
|
mp_mutex_destroy(&mpctx->abort_lock);
|
||||||
|
Loading…
Reference in New Issue
Block a user