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/avfiltergraph.c | |
| parent | de0b26ce288633846ce3ab4886a25a7e035ee041 (diff) | |
| parent | 96a47364d1cf346a5d0437e054b1b10d44d8d969 (diff) | |
| download | ffmpeg-streaming-d1b1a65662e3657ba05aa76023dde19712470f58.zip ffmpeg-streaming-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/avfiltergraph.c')
| -rw-r--r-- | libavfilter/avfiltergraph.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index 76a3a2b..69cf268 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) |
