lavfi: Drop deprecated non-const filter retrieval

Deprecated in 10/2013.
pull/272/head
Vittorio Giovara 8 years ago
parent 8e18328b18
commit 96a47364d1
  1. 5
      libavfilter/avfilter.c
  2. 5
      libavfilter/avfilter.h
  3. 4
      libavfilter/avfiltergraph.c
  4. 2
      libavfilter/graphparser.c
  5. 4
      libavfilter/version.h

@ -292,10 +292,7 @@ int ff_poll_frame(AVFilterLink *link)
static AVFilter *first_filter; static AVFilter *first_filter;
#if !FF_API_NOCONST_GET_NAME const AVFilter *avfilter_get_by_name(const char *name)
const
#endif
AVFilter *avfilter_get_by_name(const char *name)
{ {
const AVFilter *f = NULL; const AVFilter *f = NULL;

@ -449,10 +449,7 @@ 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 AVFilter *avfilter_get_by_name(const char *name);
const
#endif
AVFilter *avfilter_get_by_name(const char *name);
/** /**
* Iterate over all registered filters. * Iterate over all registered filters.

@ -293,7 +293,7 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx)
if (convert_needed) { if (convert_needed) {
AVFilterContext *convert; AVFilterContext *convert;
AVFilter *filter; const AVFilter *filter;
AVFilterLink *inlink, *outlink; AVFilterLink *inlink, *outlink;
char scale_args[256]; char scale_args[256];
char inst_name[30]; 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++) { for (j = 0; j < f->nb_inputs; j++) {
AVFilterLink *link = f->inputs[j]; AVFilterLink *link = f->inputs[j];
AVFilterContext *fifo_ctx; AVFilterContext *fifo_ctx;
AVFilter *fifo; const AVFilter *fifo;
char name[32]; char name[32];
if (!link->dstpad->needs_fifo) if (!link->dstpad->needs_fifo)

@ -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, static int create_filter(AVFilterContext **filt_ctx, AVFilterGraph *ctx, int index,
const char *filt_name, const char *args, void *log_ctx) const char *filt_name, const char *args, void *log_ctx)
{ {
AVFilter *filt; const AVFilter *filt;
char inst_name[30]; char inst_name[30];
char tmp_args[TMP_ARGS_SIZE]; char tmp_args[TMP_ARGS_SIZE];
int ret; int ret;

@ -49,8 +49,4 @@
* the public API and may change, break or disappear at any time. * 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 */ #endif /* AVFILTER_VERSION_H */

Loading…
Cancel
Save