| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-28 12:07:05 (GMT) |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-28 12:07:05 (GMT) |
| commit | a1ce060c5191dca1ef1927330de6ce413a402ffb (patch) | |
| tree | da9ec8c6ffe383da47ca01bfe13aa1a06ebc7137 | |
| parent | 252f56636ca0fc1d5223d091b1d56f6a5ab2b8af (diff) | |
| parent | 5c439b41d0489412c0a4cf6dfb98915251677b8e (diff) | |
| download | ffmpeg-a1ce060c5191dca1ef1927330de6ce413a402ffb.zip ffmpeg-a1ce060c5191dca1ef1927330de6ce413a402ffb.tar.gz ffmpeg-a1ce060c5191dca1ef1927330de6ce413a402ffb.tar.bz2 | |
Merge commit '5c439b41d0489412c0a4cf6dfb98915251677b8e'
* commit '5c439b41d0489412c0a4cf6dfb98915251677b8e':
avfilter: have avfilter_get_by_name return const for next bump
Conflicts:
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -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 f31968f..14ce55f 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -457,6 +457,9 @@ int avfilter_process_command(AVFilterContext *filter, const char *cmd, const cha static AVFilter *first_filter; +#if !FF_API_NOCONST_GET_NAME +const +#endif AVFilter *avfilter_get_by_name(const char *name) { const AVFilter *f = NULL; diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 412b123..3518ad8 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -991,6 +991,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 541b869..b9159a7 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -85,5 +85,8 @@ #ifndef FF_API_DRAWTEXT_OLD_TIMELINE #define FF_API_DRAWTEXT_OLD_TIMELINE (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 */ |