diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-28 11:02:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-28 11:02:01 +0200 |
| commit | 7381d31f2267489ed5e939707b7e77a20adc168d (patch) | |
| tree | 0e5811bf6eadc8742a1ee88634e9533d29eed927 /libavfilter/pthread.c | |
| parent | 945c7e399af230d9fde6df641f13a11dfc5d4954 (diff) | |
| parent | 0767bfd1994c4bf22e167ffadb8f823a950aad18 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavfi: allow user-provided execute() callbacks
Conflicts:
libavfilter/avfilter.h
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/pthread.c')
| -rw-r--r-- | libavfilter/pthread.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/pthread.c b/libavfilter/pthread.c index ab2966236f..0371d8ab3f 100644 --- 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; |