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/thread.h | |
parent | 945c7e399af230d9fde6df641f13a11dfc5d4954 (diff) | |
parent | 0767bfd1994c4bf22e167ffadb8f823a950aad18 (diff) | |
download | ffmpeg-streaming-7381d31f2267489ed5e939707b7e77a20adc168d.zip ffmpeg-streaming-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/thread.h')
-rw-r--r-- | libavfilter/thread.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavfilter/thread.h b/libavfilter/thread.h index 0dc3aaa..5f347e8 100644 --- a/libavfilter/thread.h +++ b/libavfilter/thread.h @@ -22,8 +22,6 @@ #include "avfilter.h" -typedef int (action_func)(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs); - int ff_graph_thread_init(AVFilterGraph *graph); void ff_graph_thread_free(AVFilterGraph *graph); |