RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "encode: make the central lock recursive" 

This reverts commit 231c667214.
This commit is contained in:
Rudolf Polzer 2014-06-12 10:37:17 +02:00
parent d69e068fda
commit 309eb6398c
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/encode_lavc.c
View File

@ -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);