* commit '50612484e058e8b241f0528584d64d9d2ccebf12': pthread: Rename thread_init to avoid symbol collision Conflicts: libavcodec/pthread.c libavfilter/pthread.c
Showing the changes to libavfilter/pthread.c (1 of 2 files). Show all
Unified · Split
| @@ -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; |