aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/pthread.c
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2013-06-30 13:34:46 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2013-06-30 13:47:45 +0200
commit674d8a9629609a17fd6916164556cb012d6e6a1c (patch)
treea12d2f0ecdf16372ca0a5a7904e44531b537570c /libavfilter/pthread.c
parent33f5d70df589bb00c576fac62fb311f08673c7c5 (diff)
downloadffmpeg-674d8a9629609a17fd6916164556cb012d6e6a1c.tar.gz
Rename thread_init() in libavcodec and libavfilter as library_thread_init().
The aix header sys/thread.h contains a definition for thread_init().
Diffstat (limited to 'libavfilter/pthread.c')
-rw-r--r--libavfilter/pthread.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/pthread.c b/libavfilter/pthread.c
index eb40f0058e..29faa28b4a 100644
--- a/libavfilter/pthread.c
+++ b/libavfilter/pthread.c
@@ -146,7 +146,7 @@ static int thread_execute(AVFilterContext *ctx, action_func *func,
return 0;
}
-static int thread_init(ThreadContext *c, int nb_threads)
+static int avfilter_thread_init(ThreadContext *c, int nb_threads)
{
int i, ret;
@@ -208,7 +208,7 @@ int ff_graph_thread_init(AVFilterGraph *graph)
if (!graph->internal->thread)
return AVERROR(ENOMEM);
- ret = thread_init(graph->internal->thread, graph->nb_threads);
+ ret = avfilter_thread_init(graph->internal->thread, graph->nb_threads);
if (ret <= 1) {
av_freep(&graph->internal->thread);
graph->thread_type = 0;