diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 01:01:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 01:31:55 +0200 |
| commit | 710b0aa8012a25b646d6c0f0853fddcd79fc5e1b (patch) | |
| tree | 0a87978efc6a0f60ef99d7a24a833c91a4a2c837 /libavfilter/version.h | |
| parent | eb0f774d4bfdb1e5cb131f63580417cfb6b47514 (diff) | |
| parent | 48a5adab62bd2a553f5069d41fa632a0701835e5 (diff) | |
Merge commit '48a5adab62bd2a553f5069d41fa632a0701835e5'
* commit '48a5adab62bd2a553f5069d41fa632a0701835e5':
lavfi: add avfilter_init_str() to replace avfilter_init_filter().
avfilter_graph_create_filter() opaque is still passed to avfilter_init_filter()
which continues to pass it to init_opaque as its still used in the buffer sinks
the sinks should be changed and the opaque passing removed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/version.h')
| -rw-r--r-- | libavfilter/version.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavfilter/version.h b/libavfilter/version.h index f3508b7d51..ef14ae9bfc 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -72,5 +72,8 @@ #ifndef FF_API_AVFILTER_OPEN #define FF_API_AVFILTER_OPEN (LIBAVFILTER_VERSION_MAJOR < 4) #endif +#ifndef FF_API_AVFILTER_INIT_FILTER +#define FF_API_AVFILTER_INIT_FILTER (LIBAVFILTER_VERSION_MAJOR < 4) +#endif #endif /* AVFILTER_VERSION_H */ |