Skip to content
Snippets Groups Projects
Commit 51fc88e7 authored by Anton Khirnov's avatar Anton Khirnov
Browse files

avconv: improve some variable names

'filter' is too generic, since the functions in question deal with
several filters.

Also add const qualifiers to those variables.
parent 77cc958f
No related branches found
No related tags found
No related merge requests found
...@@ -413,7 +413,7 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter, ...@@ -413,7 +413,7 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter,
AVFilterInOut *in) AVFilterInOut *in)
{ {
AVFilterContext *first_filter = in->filter_ctx; AVFilterContext *first_filter = in->filter_ctx;
AVFilter *filter = avfilter_get_by_name("buffer"); const AVFilter *buffer_filt = avfilter_get_by_name("buffer");
InputStream *ist = ifilter->ist; InputStream *ist = ifilter->ist;
AVRational tb = ist->framerate.num ? av_inv_q(ist->framerate) : AVRational tb = ist->framerate.num ? av_inv_q(ist->framerate) :
ist->st->time_base; ist->st->time_base;
...@@ -431,7 +431,7 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter, ...@@ -431,7 +431,7 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter,
snprintf(name, sizeof(name), "graph %d input from stream %d:%d", fg->index, snprintf(name, sizeof(name), "graph %d input from stream %d:%d", fg->index,
ist->file_index, ist->st->index); ist->file_index, ist->st->index);
if ((ret = avfilter_graph_create_filter(&ifilter->filter, filter, name, if ((ret = avfilter_graph_create_filter(&ifilter->filter, buffer_filt, name,
args, NULL, fg->graph)) < 0) args, NULL, fg->graph)) < 0)
return ret; return ret;
...@@ -462,7 +462,7 @@ static int configure_input_audio_filter(FilterGraph *fg, InputFilter *ifilter, ...@@ -462,7 +462,7 @@ static int configure_input_audio_filter(FilterGraph *fg, InputFilter *ifilter,
AVFilterInOut *in) AVFilterInOut *in)
{ {
AVFilterContext *first_filter = in->filter_ctx; AVFilterContext *first_filter = in->filter_ctx;
AVFilter *filter = avfilter_get_by_name("abuffer"); const AVFilter *abuffer_filt = avfilter_get_by_name("abuffer");
InputStream *ist = ifilter->ist; InputStream *ist = ifilter->ist;
int pad_idx = in->pad_idx; int pad_idx = in->pad_idx;
char args[255], name[255]; char args[255], name[255];
...@@ -477,7 +477,7 @@ static int configure_input_audio_filter(FilterGraph *fg, InputFilter *ifilter, ...@@ -477,7 +477,7 @@ static int configure_input_audio_filter(FilterGraph *fg, InputFilter *ifilter,
snprintf(name, sizeof(name), "graph %d input from stream %d:%d", fg->index, snprintf(name, sizeof(name), "graph %d input from stream %d:%d", fg->index,
ist->file_index, ist->st->index); ist->file_index, ist->st->index);
if ((ret = avfilter_graph_create_filter(&ifilter->filter, filter, if ((ret = avfilter_graph_create_filter(&ifilter->filter, abuffer_filt,
name, args, NULL, name, args, NULL,
fg->graph)) < 0) fg->graph)) < 0)
return ret; return ret;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment