diff options
| author | Sean McGovern <gseanmcg@gmail.com> | 2013-07-16 11:31:23 -0400 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2013-07-17 00:13:31 +0300 |
| commit | 50612484e058e8b241f0528584d64d9d2ccebf12 (patch) | |
| tree | f8786c092917bd30e953fd2c7ce2e35f5af33b3e | |
| parent | e740929a071ab032ffa382e89da69c6ec7cf882c (diff) | |
| download | ffmpeg-50612484e058e8b241f0528584d64d9d2ccebf12.tar.gz | |
pthread: Rename thread_init to avoid symbol collision
The AIX threads library exposes a function with the same name.
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rw-r--r-- | libavcodec/pthread.c | 4 | ||||
| -rw-r--r-- | libavfilter/pthread.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c index 1523353580..a4e48d329d 100644 --- a/libavcodec/pthread.c +++ b/libavcodec/pthread.c @@ -234,7 +234,7 @@ static int avcodec_thread_execute2(AVCodecContext *avctx, action_func2* func2, v return avcodec_thread_execute(avctx, NULL, arg, ret, job_count, 0); } -static int thread_init(AVCodecContext *avctx) +static int thread_init_internal(AVCodecContext *avctx) { int i; ThreadContext *c; @@ -1000,7 +1000,7 @@ int ff_thread_init(AVCodecContext *avctx) validate_thread_parameters(avctx); if (avctx->active_thread_type&FF_THREAD_SLICE) - return thread_init(avctx); + return thread_init_internal(avctx); else if (avctx->active_thread_type&FF_THREAD_FRAME) return frame_thread_init(avctx); 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; |