summaryrefslogtreecommitdiff
path: root/libavcodec/pthread.c
diff options
context:
space:
mode:
authorAlexander Strange <astrange@ithinksw.com>2011-03-29 17:18:21 -0400
committerJanne Grunau <janne-libav@jannau.net>2011-04-05 16:53:26 +0200
commitba9ef8d04ecd009036b7c380e71bac081c56c53e (patch)
tree64992160a7850a4be6ce614caa706ae1a6d852e8 /libavcodec/pthread.c
parentd6f66edd65992c1275f8e4271be212e1a4808425 (diff)
downloadffmpeg-ba9ef8d04ecd009036b7c380e71bac081c56c53e.tar.gz
Remove unnecessary parameter from ff_thread_init() and fix behavior
thread_count passed to ff_thread_init() is only used to set AVCodecContext. thread_count, and can be removed. Instead move it to the legacy implementation of avcodec_thread_init(). This also fixes the problem that calling avcodec_thread_init() with pthreads enabled did not set it since ff1efc524cb3c60f2f746e3b4550bb1a86c65316. Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Diffstat (limited to 'libavcodec/pthread.c')
-rw-r--r--libavcodec/pthread.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c
index c40fde3a02..70845f0ba0 100644
--- a/libavcodec/pthread.c
+++ b/libavcodec/pthread.c
@@ -882,7 +882,7 @@ static void validate_thread_parameters(AVCodecContext *avctx)
}
}
-int ff_thread_init(AVCodecContext *avctx, int thread_count)
+int ff_thread_init(AVCodecContext *avctx)
{
if (avctx->thread_opaque) {
av_log(avctx, AV_LOG_ERROR, "avcodec_thread_init is ignored after avcodec_open\n");