* commit '50612484e058e8b241f0528584d64d9d2ccebf12': pthread: Rename thread_init to avoid symbol collision Conflicts: libavcodec/pthread.c libavfilter/pthread.c
Unified · Split
| @@ -249,7 +249,7 @@ static int avcodec_thread_execute2(AVCodecContext *avctx, action_func2* func2, v · 248 unmodified lines | |||
| 249 | return avcodec_thread_execute(avctx, NULL, arg, ret, job_count, 0); | 249 | return avcodec_thread_execute(avctx, NULL, arg, ret, job_count, 0); |
| 250 | } | 250 | } |
| 251 | 251 | ||
| 252 | static int avcodec_thread_init(AVCodecContext *avctx) | 252 | static int thread_init_internal(AVCodecContext *avctx) |
| 253 | { | 253 | { |
| 254 | int i; | 254 | int i; |
| 255 | ThreadContext *c; | 255 | ThreadContext *c; |
| @@ -1103,7 +1103,7 @@ int ff_thread_init(AVCodecContext *avctx) · 847 unmodified lines | |||
| 1103 | validate_thread_parameters(avctx); | 1103 | validate_thread_parameters(avctx); |
| 1104 | 1104 | ||
| 1105 | if (avctx->active_thread_type&FF_THREAD_SLICE) | 1105 | if (avctx->active_thread_type&FF_THREAD_SLICE) |
| 1106 | return avcodec_thread_init(avctx); | 1106 | return thread_init_internal(avctx); |
| 1107 | else if (avctx->active_thread_type&FF_THREAD_FRAME) | 1107 | else if (avctx->active_thread_type&FF_THREAD_FRAME) |
| 1108 | return frame_thread_init(avctx); | 1108 | return frame_thread_init(avctx); |
| 1109 | 1109 | ||
| @@ -146,7 +146,7 @@ static int thread_execute(AVFilterContext *ctx, action_func *func, · 145 unmodified lines | |||
| 146 | return 0; | 146 | return 0; |
| 147 | } | 147 | } |
| 148 | 148 | ||
| 149 | static int avfilter_thread_init(ThreadContext *c, int nb_threads) | 149 | static int thread_init_internal(ThreadContext *c, int nb_threads) |
| 150 | { | 150 | { |
| 151 | int i, ret; | 151 | int i, ret; |
| 152 | 152 | ||
| @@ -208,7 +208,7 @@ int ff_graph_thread_init(AVFilterGraph *graph) · 55 unmodified lines | |||
| 208 | if (!graph->internal->thread) | 208 | if (!graph->internal->thread) |
| 209 | return AVERROR(ENOMEM); | 209 | return AVERROR(ENOMEM); |
| 210 | 210 | ||
| 211 | ret = avfilter_thread_init(graph->internal->thread, graph->nb_threads); | 211 | ret = thread_init_internal(graph->internal->thread, graph->nb_threads); |
| 212 | if (ret <= 1) { | 212 | if (ret <= 1) { |
| 213 | av_freep(&graph->internal->thread); | 213 | av_freep(&graph->internal->thread); |
| 214 | graph->thread_type = 0; | 214 | graph->thread_type = 0; |