RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-24 16:22:37 +00:00
Code Issues Projects Releases Wiki Activity

pthread: Rename thread_init to avoid symbol collision

Browse Source 
The AIX threads library exposes a function with the same name.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Sean McGovern 2013-07-16 11:31:23 -04:00 committed by Martin Storsjö
parent e740929a07
commit 50612484e0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/pthread.c
View File

@ -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);

4
libavfilter/pthread.c
View File

@ -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;