diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 00:44:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 00:44:18 +0200 |
| commit | 4fde705396759ad96a662a400d5f1667c19c614b (patch) | |
| tree | 4dfe04a9c1865a2e3ee11e78c606356054c762d5 /libavfilter/avfilter.h | |
| parent | 5c68e14e42c181f03d956465c557b7b890fd1983 (diff) | |
| parent | 111367263af41c88a44bd763ceefc11d53a7f655 (diff) | |
Merge commit '111367263af41c88a44bd763ceefc11d53a7f655'
* commit '111367263af41c88a44bd763ceefc11d53a7f655':
lavfi: add AVFilterContext.graph.
Conflicts:
libavfilter/avfilter.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/avfilter.h')
| -rw-r--r-- | libavfilter/avfilter.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index e09fd75930..2360b24f7f 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -527,6 +527,8 @@ struct AVFilterContext { void *priv; ///< private data for use by the filter + struct AVFilterGraph *graph; ///< filtergraph this filter belongs to + struct AVFilterCommand *command_queue; }; |