diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-21 15:40:14 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-21 15:40:14 -0300 |
| commit | d1b1a65662e3657ba05aa76023dde19712470f58 (patch) | |
| tree | d6039419901962a70d9cc743685b83671cfa7a4e /libavfilter | |
| parent | de0b26ce288633846ce3ab4886a25a7e035ee041 (diff) | |
| parent | 96a47364d1cf346a5d0437e054b1b10d44d8d969 (diff) | |
| download | ffmpeg-d1b1a65662e3657ba05aa76023dde19712470f58.tar.gz | |
Merge commit '96a47364d1cf346a5d0437e054b1b10d44d8d969'
* commit '96a47364d1cf346a5d0437e054b1b10d44d8d969':
lavfi: Drop deprecated non-const filter retrieval
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/avfilter.c | 5 | ||||
| -rw-r--r-- | libavfilter/avfilter.h | 5 | ||||
| -rw-r--r-- | libavfilter/avfiltergraph.c | 4 | ||||
| -rw-r--r-- | libavfilter/version.h | 3 |
4 files changed, 4 insertions, 13 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; diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 6be7625676..47546c15e5 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -699,10 +699,7 @@ 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); +const AVFilter *avfilter_get_by_name(const char *name); /** * Iterate over all registered filters. diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index 76a3a2b8ed..69cf26896d 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -492,7 +492,7 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx) if (convert_needed) { AVFilterContext *convert; - AVFilter *filter; + const AVFilter *filter; AVFilterLink *inlink, *outlink; char scale_args[256]; char inst_name[30]; @@ -1218,7 +1218,7 @@ static int graph_insert_fifos(AVFilterGraph *graph, AVClass *log_ctx) for (j = 0; j < f->nb_inputs; j++) { AVFilterLink *link = f->inputs[j]; AVFilterContext *fifo_ctx; - AVFilter *fifo; + const AVFilter *fifo; char name[32]; if (!link->dstpad->needs_fifo) diff --git a/libavfilter/version.h b/libavfilter/version.h index 2d5caa8105..5bcf9b4df0 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -52,9 +52,6 @@ #ifndef FF_API_OLD_FILTER_OPTS_ERROR #define FF_API_OLD_FILTER_OPTS_ERROR (LIBAVFILTER_VERSION_MAJOR < 8) #endif -#ifndef FF_API_NOCONST_GET_NAME -#define FF_API_NOCONST_GET_NAME (LIBAVFILTER_VERSION_MAJOR < 7) -#endif #ifndef FF_API_LAVR_OPTS #define FF_API_LAVR_OPTS (LIBAVFILTER_VERSION_MAJOR < 8) #endif |