From: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Date: Mon, 27 Sep 2010 21:57:16 +0000 (+0000)
Subject: Use more expressive names for the avfilter_insert_filter() in and out
X-Git-Tag: v0.7b2~2425
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=486adc55c0faa6ebc693645dbbeb1c11d2768280;p=coroid%2Flibav_saccubus.git

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

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 9e1940be8..ea6f9fed8 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 b1d565b10..6fc750080 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.