Commit a1ce060c authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '5c439b41'

* commit '5c439b41':
  avfilter: have avfilter_get_by_name return const for next bump

Conflicts:
	libavfilter/version.h
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 252f5663 5c439b41
...@@ -457,6 +457,9 @@ int avfilter_process_command(AVFilterContext *filter, const char *cmd, const cha ...@@ -457,6 +457,9 @@ int avfilter_process_command(AVFilterContext *filter, const char *cmd, const cha
static AVFilter *first_filter; static AVFilter *first_filter;
#if !FF_API_NOCONST_GET_NAME
const
#endif
AVFilter *avfilter_get_by_name(const char *name) AVFilter *avfilter_get_by_name(const char *name)
{ {
const AVFilter *f = NULL; const AVFilter *f = NULL;
......
...@@ -991,6 +991,9 @@ int avfilter_register(AVFilter *filter); ...@@ -991,6 +991,9 @@ int avfilter_register(AVFilter *filter);
* @return the filter definition, if any matching one is registered. * @return the filter definition, if any matching one is registered.
* NULL if none found. * NULL if none found.
*/ */
#if !FF_API_NOCONST_GET_NAME
const
#endif
AVFilter *avfilter_get_by_name(const char *name); AVFilter *avfilter_get_by_name(const char *name);
/** /**
......
...@@ -85,5 +85,8 @@ ...@@ -85,5 +85,8 @@
#ifndef FF_API_DRAWTEXT_OLD_TIMELINE #ifndef FF_API_DRAWTEXT_OLD_TIMELINE
#define FF_API_DRAWTEXT_OLD_TIMELINE (LIBAVFILTER_VERSION_MAJOR < 4) #define FF_API_DRAWTEXT_OLD_TIMELINE (LIBAVFILTER_VERSION_MAJOR < 4)
#endif #endif
#ifndef FF_API_NOCONST_GET_NAME
#define FF_API_NOCONST_GET_NAME (LIBAVFILTER_VERSION_MAJOR < 4)
#endif
#endif /* AVFILTER_VERSION_H */ #endif /* AVFILTER_VERSION_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment