diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2016-12-05 13:58:30 -0500 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2017-03-23 10:09:11 +0100 |
| commit | 96a47364d1cf346a5d0437e054b1b10d44d8d969 (patch) | |
| tree | 93428723c5f757ad8fcd27e67a6338cf22524e8b /libavfilter | |
| parent | 8e18328b18e69b38a5feae5d10ad01b403a205b6 (diff) | |
| download | ffmpeg-96a47364d1cf346a5d0437e054b1b10d44d8d969.tar.gz | |
lavfi: Drop deprecated non-const filter retrieval
Deprecated in 10/2013.
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/graphparser.c | 2 | ||||
| -rw-r--r-- | libavfilter/version.h | 4 |
5 files changed, 5 insertions, 15 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 3ae7a591db..83c1a7c20d 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -292,10 +292,7 @@ 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) +const AVFilter *avfilter_get_by_name(const char *name) { const AVFilter *f = NULL; diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 96d3e31863..6df69dbbbf 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -449,10 +449,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 58ede68a31..a0f797e283 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -293,7 +293,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]; @@ -759,7 +759,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/graphparser.c b/libavfilter/graphparser.c index da499b52c9..4c75c045f1 100644 --- a/libavfilter/graphparser.c +++ b/libavfilter/graphparser.c @@ -131,7 +131,7 @@ static void append_sws_flags(const char **args, const char *sws_opts, char *tmp) static int create_filter(AVFilterContext **filt_ctx, AVFilterGraph *ctx, int index, const char *filt_name, const char *args, void *log_ctx) { - AVFilter *filt; + const AVFilter *filt; char inst_name[30]; char tmp_args[TMP_ARGS_SIZE]; int ret; diff --git a/libavfilter/version.h b/libavfilter/version.h index 4f3da2bd10..62fc97dd27 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -49,8 +49,4 @@ * the public API and may change, break or disappear at any time. */ -#ifndef FF_API_NOCONST_GET_NAME -#define FF_API_NOCONST_GET_NAME (LIBAVFILTER_VERSION_MAJOR < 7) -#endif - #endif /* AVFILTER_VERSION_H */ |