aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/pthread.c
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2011-03-26 13:55:30 +0100
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>2011-03-28 23:07:52 +0200
commit46027c7286144294dee565946dccb59f1a8dfeca (patch)
treea4bd06202a3882ae15b59c252c75f0b39ced2283 /libavcodec/pthread.c
parent95c8bb03edf5d5c7310947819c4c8691a5e3dfb0 (diff)
downloadffmpeg-46027c7286144294dee565946dccb59f1a8dfeca.tar.gz
Unbreak avcodec_thread_init
avcodec_thread_init currently doesn't do anything at all with pthreads enabled.
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 658dbacb89..380edaa4c5 100644
--- a/libavcodec/pthread.c
+++ b/libavcodec/pthread.c
@@ -880,7 +880,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");