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/internal.h | |
| parent | 945c7e399af230d9fde6df641f13a11dfc5d4954 (diff) | |
| parent | 0767bfd1994c4bf22e167ffadb8f823a950aad18 (diff) | |
| download | ffmpeg-7381d31f2267489ed5e939707b7e77a20adc168d.tar.gz | |
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/internal.h')
| -rw-r--r-- | libavfilter/internal.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libavfilter/internal.h b/libavfilter/internal.h index 1e8cd589fb..5ea3cad159 100644 --- a/libavfilter/internal.h +++ b/libavfilter/internal.h @@ -146,13 +146,11 @@ struct AVFilterPad { struct AVFilterGraphInternal { void *thread; - int (*thread_execute)(AVFilterContext *ctx, action_func *func, void *arg, - int *ret, int nb_jobs); + avfilter_execute_func *thread_execute; }; struct AVFilterInternal { - int (*execute)(AVFilterContext *ctx, action_func *func, void *arg, - int *ret, int nb_jobs); + avfilter_execute_func *execute; }; #if FF_API_AVFILTERBUFFER |