diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 15:01:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 15:08:40 +0200 |
| commit | 835cc0f2e7098fbb548d7622110c4fdc0831809d (patch) | |
| tree | 22408566623b068dd3eb0ab2a49751fb1ecde67d /libavfilter/version.h | |
| parent | f4db6bfeb86feda2aeb98072e55b55de85ba0962 (diff) | |
| parent | fa2a34cd40d124161c748bb0f430dc63c94dd0da (diff) | |
Merge commit 'fa2a34cd40d124161c748bb0f430dc63c94dd0da'
* commit 'fa2a34cd40d124161c748bb0f430dc63c94dd0da':
lavfi: change the filter registering system to match the other libraries
Conflicts:
cmdutils.c
ffplay.c
libavfilter/avfilter.c
libavfilter/avfilter.h
This removes the ability to put AVFilters in read only memory and having
them shareable.
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 ef14ae9bfc..3112dd5cd0 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -75,5 +75,8 @@ #ifndef FF_API_AVFILTER_INIT_FILTER #define FF_API_AVFILTER_INIT_FILTER (LIBAVFILTER_VERSION_MAJOR < 4) #endif +#ifndef FF_API_OLD_FILTER_REGISTER +#define FF_API_OLD_FILTER_REGISTER (LIBAVFILTER_VERSION_MAJOR < 4) +#endif #endif /* AVFILTER_VERSION_H */ |