diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-08-08 16:28:41 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-09-28 08:06:19 +0200 |
| commit | 0767bfd1994c4bf22e167ffadb8f823a950aad18 (patch) | |
| tree | bdbf92d10ec581bb324cd245dcfc6e888dcaa12c /libavfilter/pthread.c | |
| parent | 38e15df1489d86c016515223ee693e7d0326c56a (diff) | |
| download | ffmpeg-0767bfd1994c4bf22e167ffadb8f823a950aad18.tar.gz | |
lavfi: allow user-provided execute() callbacks
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 2af0936ab5..a4f45c82cd 100644 --- a/libavfilter/pthread.c +++ b/libavfilter/pthread.c @@ -43,7 +43,7 @@ typedef struct ThreadContext { int nb_threads; pthread_t *workers; - action_func *func; + avfilter_action_func *func; /* per-execute perameters */ AVFilterContext *ctx; @@ -114,7 +114,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; |