diff options
author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-09-28 01:57:16 +0400 |
---|---|---|
committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-09-28 01:57:16 +0400 |
commit | 486adc55c0faa6ebc693645dbbeb1c11d2768280 (patch) | |
tree | 04a1e236d6c8357c6e4f2f5ba317e79612de4b25 /libavfilter | |
parent | fa6f4ebc08d228ce9795f1f4178d68e31407aeb9 (diff) |
Use more expressive names for the avfilter_insert_filter() in and out
parameters.
Originally committed as revision 25235 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavfilter')
-rw-r--r-- | libavfilter/avfilter.c | 10 | ||||
-rw-r--r-- | libavfilter/avfilter.h | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 9e1940be8f..ea6f9fed83 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -122,7 +122,7 @@ int avfilter_link(AVFilterContext *src, unsigned srcpad, } int avfilter_insert_filter(AVFilterLink *link, AVFilterContext *filt, - unsigned in, unsigned out) + unsigned filt_srcpad_idx, unsigned filt_dstpad_idx) { int ret; unsigned dstpad_idx = link->dstpad - link->dst->input_pads; @@ -132,7 +132,7 @@ int avfilter_insert_filter(AVFilterLink *link, AVFilterContext *filt, filt->name, link->src->name, link->dst->name); link->dst->inputs[dstpad_idx] = NULL; - if ((ret = avfilter_link(filt, out, link->dst, dstpad_idx)) < 0) { + if ((ret = avfilter_link(filt, filt_dstpad_idx, link->dst, dstpad_idx)) < 0) { /* failed to link output filter to new filter */ link->dst->inputs[dstpad_idx] = link; return ret; @@ -140,14 +140,14 @@ int avfilter_insert_filter(AVFilterLink *link, AVFilterContext *filt, /* re-hookup the link to the new destination filter we inserted */ link->dst = filt; - link->dstpad = &filt->input_pads[in]; - filt->inputs[in] = link; + link->dstpad = &filt->input_pads[filt_srcpad_idx]; + filt->inputs[filt_srcpad_idx] = link; /* if any information on supported media formats already exists on the * link, we need to preserve that */ if (link->out_formats) avfilter_formats_changeref(&link->out_formats, - &filt->outputs[out]->out_formats); + &filt->outputs[filt_dstpad_idx]->out_formats); return 0; } diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index b1d565b103..6fc7500809 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -783,12 +783,12 @@ void avfilter_destroy(AVFilterContext *filter); * * @param link the link into which the filter should be inserted * @param filt the filter to be inserted - * @param in the input pad on the filter to connect - * @param out the output pad on the filter to connect + * @param filt_srcpad_idx the input pad on the filter to connect + * @param filt_dstpad_idx the output pad on the filter to connect * @return zero on success */ int avfilter_insert_filter(AVFilterLink *link, AVFilterContext *filt, - unsigned in, unsigned out); + unsigned filt_srcpad_idx, unsigned filt_dstpad_idx); /** * Insert a new pad. |