summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRudolf Polzer <divVerent@xonotic.org>2014-06-12 10:37:17 +0200
committerRudolf Polzer <divVerent@xonotic.org>2014-06-12 10:37:17 +0200
commit309eb6398ce5faebbe9a53c6fe74dbcb3d79367e (patch)
tree5212e00aece2686f6c6ff5fbf3cbc0413167d499
parentd69e068fda13288c8040b83bd1aa67699a2dddd3 (diff)
downloadmpv-309eb6398ce5faebbe9a53c6fe74dbcb3d79367e.tar.bz2
mpv-309eb6398ce5faebbe9a53c6fe74dbcb3d79367e.tar.xz
Revert "encode: make the central lock recursive"
This reverts commit 231c6672140f019257edd26db20fbcfc2554258f.
-rw-r--r--common/encode_lavc.c3
1 files changed, 1 insertions, 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);