From 309eb6398ce5faebbe9a53c6fe74dbcb3d79367e Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Thu, 12 Jun 2014 10:37:17 +0200 Subject: Revert "encode: make the central lock recursive" This reverts commit 231c6672140f019257edd26db20fbcfc2554258f. --- common/encode_lavc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/common/encode_lavc.c b/common/encode_lavc.c index 58df2bd7d3..df5710e07a 100644 --- a/common/encode_lavc.c +++ b/common/encode_lavc.c @@ -30,7 +30,6 @@ #include "options/m_option.h" #include "options/options.h" #include "osdep/timer.h" -#include "osdep/threads.h" #include "video/out/vo.h" #include "talloc.h" #include "stream/stream.h" @@ -175,7 +174,7 @@ struct encode_lavc_context *encode_lavc_init(struct encode_opts *options, mp_msg_force_stderr(global, true); ctx = talloc_zero(NULL, struct encode_lavc_context); - mpthread_mutex_init_recursive(&ctx->lock); + pthread_mutex_init(&ctx->lock, NULL); ctx->log = mp_log_new(ctx, global->log, "encode-lavc"); ctx->global = global; encode_lavc_discontinuity(ctx); -- cgit v1.2.3