diff options
author | James Almer <jamrial@gmail.com> | 2017-10-21 21:40:14 +0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-10-21 21:40:14 +0300 |
commit | d1b1a65662e3657ba05aa76023dde19712470f58 (patch) | |
tree | d6039419901962a70d9cc743685b83671cfa7a4e /libavfilter/avfilter.c | |
parent | de0b26ce288633846ce3ab4886a25a7e035ee041 (diff) | |
parent | 96a47364d1cf346a5d0437e054b1b10d44d8d969 (diff) |
Merge commit '96a47364d1cf346a5d0437e054b1b10d44d8d969'
* commit '96a47364d1cf346a5d0437e054b1b10d44d8d969':
lavfi: Drop deprecated non-const filter retrieval
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavfilter/avfilter.c')
-rw-r--r-- | libavfilter/avfilter.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 6740cd3755..bc9e60bb85 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -576,10 +576,7 @@ int avfilter_process_command(AVFilterContext *filter, const char *cmd, const cha static AVFilter *first_filter; static AVFilter **last_filter = &first_filter; -#if !FF_API_NOCONST_GET_NAME -const -#endif -AVFilter *avfilter_get_by_name(const char *name) +const AVFilter *avfilter_get_by_name(const char *name) { const AVFilter *f = NULL; |