Merge remote-tracking branch 'rbultje/master'

[ffmpeg] / libavfilter / pthread.c

diff --git a/libavfilter/pthread.c b/libavfilter/pthread.c
index ab2966236f251787c5dd5c7d9ac43e409fb17a11..0371d8ab3fcb5b3c7cff5769c0e2782120a4cd76 100644 (file)
--- a/libavfilter/pthread.c
+++ b/libavfilter/pthread.c
@@ -45,7 +45,7 @@ typedef struct ThreadContext {
 
     int nb_threads;
     pthread_t *workers;
-    action_func *func;
+    avfilter_action_func *func;
 
     /* per-execute perameters */
     AVFilterContext *ctx;
@@ -116,7 +116,7 @@ static void slice_thread_park_workers(ThreadContext *c)
     pthread_mutex_unlock(&c->current_job_lock);
 }
 
-static int thread_execute(AVFilterContext *ctx, action_func *func,
+static int thread_execute(AVFilterContext *ctx, avfilter_action_func *func,
                           void *arg, int *ret, int nb_jobs)
 {
     ThreadContext *c = ctx->graph->internal->thread;