MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '50612484e058e8b241f0528584d64d9d2ccebf12'

Browse Source 
* commit '50612484e058e8b241f0528584d64d9d2ccebf12':
  pthread: Rename thread_init to avoid symbol collision

Conflicts:
	libavcodec/pthread.c
	libavfilter/pthread.c

See: 674d8a9629
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-07-17 10:33:02 +02:00
commit 10336ca640
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

@ -249,7 +249,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 avcodec_thread_init(AVCodecContext *avctx)
static int thread_init_internal(AVCodecContext *avctx)
{
int i;
ThreadContext *c;
@ -1103,7 +1103,7 @@ int ff_thread_init(AVCodecContext *avctx)
validate_thread_parameters(avctx);
if (avctx->active_thread_type&FF_THREAD_SLICE)
return avcodec_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

@ -146,7 +146,7 @@ static int thread_execute(AVFilterContext *ctx, action_func *func,
return 0;
}
static int avfilter_thread_init(ThreadContext *c, int nb_threads)
static int thread_init_internal(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 = avfilter_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;