summaryrefslogtreecommitdiff
authorVittorio Giovara <vittorio.giovara@gmail.com>2013-10-28 01:58:12 (GMT)
committer Anton Khirnov <anton@khirnov.net>2013-10-28 06:57:44 (GMT)
commit5c439b41d0489412c0a4cf6dfb98915251677b8e (patch)
tree9069f3544b52caf19da4dfc8bc635b25d1f557cf
parent97de206b44a48da726807cc3e7b9448a8112760b (diff)
downloadffmpeg-5c439b41d0489412c0a4cf6dfb98915251677b8e.zip
ffmpeg-5c439b41d0489412c0a4cf6dfb98915251677b8e.tar.gz
ffmpeg-5c439b41d0489412c0a4cf6dfb98915251677b8e.tar.bz2
avfilter: have avfilter_get_by_name return const for next bump
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat
-rw-r--r--libavfilter/avfilter.c3
-rw-r--r--libavfilter/avfilter.h3
-rw-r--r--libavfilter/version.h3
3 files changed, 9 insertions, 0 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 88e39bf..68e0f2c 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 ca11be9..9f14afd 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 9c84e0f..02f348e 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 */