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/avfilter.c | |
| parent | 945c7e399af230d9fde6df641f13a11dfc5d4954 (diff) | |
| parent | 0767bfd1994c4bf22e167ffadb8f823a950aad18 (diff) | |
| download | android_external_ffmpeg-7381d31f2267489ed5e939707b7e77a20adc168d.tar.gz android_external_ffmpeg-7381d31f2267489ed5e939707b7e77a20adc168d.tar.bz2 android_external_ffmpeg-7381d31f2267489ed5e939707b7e77a20adc168d.zip | |
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/avfilter.c')
| -rw-r--r-- | libavfilter/avfilter.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 85b0ce2a97..b5b3734944 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -576,7 +576,7 @@ static const AVClass avfilter_class = { .option = avfilter_options, }; -static int default_execute(AVFilterContext *ctx, action_func *func, void *arg, +static int default_execute(AVFilterContext *ctx, avfilter_action_func *func, void *arg, int *ret, int nb_jobs) { int i; |