diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-17 10:33:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-17 10:40:15 +0200 |
| commit | 10336ca6400a789e221027923c03400c102e50b9 (patch) | |
| tree | a6a772f5f798c67825afcc579ce9e136eeec98c4 | |
| parent | 9836f47cf8b6effb0e1d80b5acfdc32e49265e98 (diff) | |
| parent | 50612484e058e8b241f0528584d64d9d2ccebf12 (diff) | |
Merge commit '50612484e058e8b241f0528584d64d9d2ccebf12'
* commit '50612484e058e8b241f0528584d64d9d2ccebf12':
pthread: Rename thread_init to avoid symbol collision
Conflicts:
libavcodec/pthread.c
libavfilter/pthread.c
See: 674d8a9629609a17fd6916164556cb012d6e6a1c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -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 af3ef2dac8..f8ffd76e9e 100644 --- a/libavcodec/pthread.c +++ b/libavcodec/pthread.c @@ -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); diff --git a/libavfilter/pthread.c b/libavfilter/pthread.c index 29faa28b4a..ab2966236f 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 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; |