diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 23:56:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 00:31:44 +0200 |
| commit | 86070b8e5a0e0ba087a9ce2a050c00094e29f35b (patch) | |
| tree | 6e82eb3de383fa6f8756c5053d26e52fbf29f07b /libavfilter/version.h | |
| parent | 9da369604ecf31d9dce2dee21ed214b8c43264c6 (diff) | |
| parent | bc1a985ba030e9861d24965d42792850b43a43ea (diff) | |
Merge commit 'bc1a985ba030e9861d24965d42792850b43a43ea'
* commit 'bc1a985ba030e9861d24965d42792850b43a43ea':
lavfi: replace avfilter_open() with avfilter_graph_alloc_filter().
Conflicts:
libavfilter/avfiltergraph.c
libavfilter/internal.h
libavfilter/version.h
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 b2e0b5e221..f3508b7d51 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -69,5 +69,8 @@ #ifndef FF_API_ACONVERT_FILTER #define FF_API_ACONVERT_FILTER (LIBAVFILTER_VERSION_MAJOR < 4) #endif +#ifndef FF_API_AVFILTER_OPEN +#define FF_API_AVFILTER_OPEN (LIBAVFILTER_VERSION_MAJOR < 4) +#endif #endif /* AVFILTER_VERSION_H */ |