diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2013-10-28 02:58:12 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-10-28 07:57:44 +0100 |
| commit | 5c439b41d0489412c0a4cf6dfb98915251677b8e (patch) | |
| tree | 9069f3544b52caf19da4dfc8bc635b25d1f557cf /libavfilter | |
| parent | 97de206b44a48da726807cc3e7b9448a8112760b (diff) | |
| download | ffmpeg-5c439b41d0489412c0a4cf6dfb98915251677b8e.tar.gz | |
avfilter: have avfilter_get_by_name return const for next bump
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/avfilter.c | 3 | ||||
| -rw-r--r-- | libavfilter/avfilter.h | 3 | ||||
| -rw-r--r-- | libavfilter/version.h | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 88e39bf720..68e0f2c215 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -272,6 +272,9 @@ int ff_poll_frame(AVFilterLink *link) static AVFilter *first_filter; +#if !FF_API_NOCONST_GET_NAME +const +#endif AVFilter *avfilter_get_by_name(const char *name) { AVFilter *f = NULL; diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index ca11be9bc6..9f14afdbc5 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -764,6 +764,9 @@ int avfilter_register(AVFilter *filter); * @return the filter definition, if any matching one is registered. * NULL if none found. */ +#if !FF_API_NOCONST_GET_NAME +const +#endif AVFilter *avfilter_get_by_name(const char *name); /** diff --git a/libavfilter/version.h b/libavfilter/version.h index 9c84e0f85a..02f348ebb7 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -68,5 +68,8 @@ #ifndef FF_API_OLD_FILTER_REGISTER #define FF_API_OLD_FILTER_REGISTER (LIBAVFILTER_VERSION_MAJOR < 4) #endif +#ifndef FF_API_NOCONST_GET_NAME +#define FF_API_NOCONST_GET_NAME (LIBAVFILTER_VERSION_MAJOR < 4) +#endif #endif /* AVFILTER_VERSION_H */ |