| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-05 07:32:31 (GMT) |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-05 07:32:31 (GMT) |
| commit | 783c674da7da4335b75c23809774161e4ac4398d (patch) | |
| tree | 47ed28d389e2beb158357ddacc450dea94b8b31c | |
| parent | 46b3dbf9ca1b65d909a27e01c7b6742d41688ce2 (diff) | |
| parent | 51fc88e7467169031b20b9983d80456b893a9fa3 (diff) | |
| download | ffmpeg-783c674da7da4335b75c23809774161e4ac4398d.zip ffmpeg-783c674da7da4335b75c23809774161e4ac4398d.tar.gz ffmpeg-783c674da7da4335b75c23809774161e4ac4398d.tar.bz2 | |
Merge commit '51fc88e7467169031b20b9983d80456b893a9fa3'
* commit '51fc88e7467169031b20b9983d80456b893a9fa3':
avconv: improve some variable names
Conflicts:
ffmpeg_filter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | ffmpeg_filter.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c index 1fe2106..89ee7e9 100644 --- a/ffmpeg_filter.c +++ b/ffmpeg_filter.c @@ -613,7 +613,7 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter, AVFilterInOut *in) { 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; AVRational tb = ist->framerate.num ? av_inv_q(ist->framerate) : ist->st->time_base; @@ -650,7 +650,7 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter, snprintf(name, sizeof(name), "graph %d input from stream %d:%d", fg->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.str, NULL, fg->graph)) < 0) return ret; @@ -699,7 +699,7 @@ static int configure_input_audio_filter(FilterGraph *fg, InputFilter *ifilter, AVFilterInOut *in) { 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; int pad_idx = in->pad_idx; AVBPrint args; @@ -719,7 +719,7 @@ static int configure_input_audio_filter(FilterGraph *fg, InputFilter *ifilter, snprintf(name, sizeof(name), "graph %d input from stream %d:%d", fg->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.str, NULL, fg->graph)) < 0) return ret; |