From 50612484e058e8b241f0528584d64d9d2ccebf12 Mon Sep 17 00:00:00 2001 From: Sean McGovern Date: Tue, 16 Jul 2013 11:31:23 -0400 Subject: pthread: Rename thread_init to avoid symbol collision MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The AIX threads library exposes a function with the same name. Signed-off-by: Martin Storsjö --- libavfilter/pthread.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavfilter/pthread.c') diff --git a/libavfilter/pthread.c b/libavfilter/pthread.c index 374c1c32c3..2af0936ab5 100644 --- a/libavfilter/pthread.c +++ b/libavfilter/pthread.c @@ -144,7 +144,7 @@ static int thread_execute(AVFilterContext *ctx, action_func *func, return 0; } -static int thread_init(ThreadContext *c, int nb_threads) +static int thread_init_internal(ThreadContext *c, int nb_threads) { int i, ret; @@ -207,7 +207,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 = thread_init_internal(graph->internal->thread, graph->nb_threads); if (ret <= 1) { av_freep(&graph->internal->thread); graph->thread_type = 0; -- cgit v1.2.3