diff options
Diffstat (limited to 'player/main.c')
| -rw-r--r-- | player/main.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/player/main.c b/player/main.c index ce438636c3..046d41c6b2 100644 --- a/player/main.c +++ b/player/main.c @@ -25,7 +25,7 @@ #include <signal.h> #include "config.h" -#include "talloc.h" +#include "mpv_talloc.h" #include "misc/dispatch.h" #include "osdep/io.h" @@ -156,7 +156,7 @@ void mp_print_version(struct mp_log *log, int always) { int v = always ? MSGL_INFO : MSGL_V; mp_msg(log, v, - "%s (C) 2000-2015 mpv/MPlayer/mplayer2 projects\n built on %s\n", + "%s (C) 2000-2016 mpv/MPlayer/mplayer2 projects\n built on %s\n", mpv_version, mpv_builddate); print_libav_versions(log, v); mp_msg(log, v, "\n"); @@ -222,7 +222,6 @@ void mp_destroy(struct MPContext *mpctx) pthread_detach(pthread_self()); mp_msg_uninit(mpctx->global); - pthread_mutex_destroy(&mpctx->ass_lock); talloc_free(mpctx); } @@ -330,8 +329,6 @@ struct MPContext *mp_create(void) .playback_abort = mp_cancel_new(mpctx), }; - pthread_mutex_init(&mpctx->ass_lock, NULL); - mpctx->global = talloc_zero(mpctx, struct mpv_global); // Nothing must call mp_msg*() and related before this |