RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '96a47364d1cf346a5d0437e054b1b10d44d8d969' 

* commit '96a47364d1cf346a5d0437e054b1b10d44d8d969':
  lavfi: Drop deprecated non-const filter retrieval

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-10-21 15:40:14 -03:00
parent de0b26ce28 96a47364d1
commit d1b1a65662
4 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavfilter/avfilter.c
View File

@ -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;

5
libavfilter/avfilter.h
View File

@ -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.

4
libavfilter/avfiltergraph.c
View File

@ -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)

3
libavfilter/version.h
View File

@ -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