diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-13 22:02:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-13 22:02:19 +0100 |
| commit | 79f013a206394bfc90bbb72995f5cf8965181f51 (patch) | |
| tree | 3672717aa3736f7fd4dd3aa6abd4394e43aeb104 /libavcodec/utils.c | |
| parent | 3f375950f3c9a9c5cf7cece6c26d3e0e7ce278cf (diff) | |
| parent | 9993a067f6c8c7e7838052ac3146aa6b80dd7e81 (diff) | |
| download | ffmpeg-79f013a206394bfc90bbb72995f5cf8965181f51.tar.gz | |
Merge commit '9993a067f6c8c7e7838052ac3146aa6b80dd7e81'
* commit '9993a067f6c8c7e7838052ac3146aa6b80dd7e81':
lavc: Improve thread locking error message
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index d739047d6d..b3749af340 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -3608,7 +3608,10 @@ int ff_lock_avcodec(AVCodecContext *log_ctx) } entangled_thread_counter++; if (entangled_thread_counter != 1) { - av_log(log_ctx, AV_LOG_ERROR, "Insufficient thread locking around avcodec_open/close()\n"); + av_log(log_ctx, AV_LOG_ERROR, + "Insufficient thread locking. At least %d threads are " + "calling avcodec_open2() at the same time right now.\n", + entangled_thread_counter); if (!lockmgr_cb) av_log(log_ctx, AV_LOG_ERROR, "No lock manager is set, please see av_lockmgr_register()\n"); ff_avcodec_locked = 1; |