msg must be the last module to uninit since pretty much everything else uses logging. This reverts commit f92d5da89cf0b025f1bee1801e66911fe1efb6ff. This reverts commit c1282d4d43be8fb8bbc8529b22804d288d59038a.
Unified · Split
| @@ -187,10 +187,6 @@ void mp_destroy(struct MPContext *mpctx) · 186 unmodified lines | |||
| 187 | cocoa_set_input_context(NULL); | 187 | cocoa_set_input_context(NULL); |
| 188 | #endif | 188 | #endif |
| 189 | 189 | ||
| 190 | uninit_libav(mpctx->global); | ||
| 191 | |||
| 192 | mp_msg_uninit(mpctx->global); | ||
| 193 | |||
| 194 | if (cas_terminal_owner(mpctx, mpctx)) { | 190 | if (cas_terminal_owner(mpctx, mpctx)) { |
| 195 | terminal_uninit(); | 191 | terminal_uninit(); |
| 196 | cas_terminal_owner(mpctx, NULL); | 192 | cas_terminal_owner(mpctx, NULL); |
| @@ -198,6 +194,9 @@ void mp_destroy(struct MPContext *mpctx) · 1 unmodified line | |||
| 198 | 194 | ||
| 199 | mp_input_uninit(mpctx->input); | 195 | mp_input_uninit(mpctx->input); |
| 200 | 196 | ||
| 197 | uninit_libav(mpctx->global); | ||
| 198 | |||
| 199 | mp_msg_uninit(mpctx->global); | ||
| 201 | assert(!mpctx->num_abort_list); | 200 | assert(!mpctx->num_abort_list); |
| 202 | talloc_free(mpctx->abort_list); | 201 | talloc_free(mpctx->abort_list); |
| 203 | mp_mutex_destroy(&mpctx->abort_lock); | 202 | mp_mutex_destroy(&mpctx->abort_lock); |