[FFmpeg-devel] [PATCH 2/2] lavfi/formats: simplify a macro parameters.

[Nicolas George]

Signed-off-by: Nicolas George <george at nsup.org>
---
 libavfilter/formats.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/libavfilter/formats.c b/libavfilter/formats.c
index 32f41f2c13..8843200f47 100644
--- a/libavfilter/formats.c
+++ b/libavfilter/formats.c
@@ -549,15 +549,15 @@ void ff_formats_changeref(AVFilterFormats **oldref, AVFilterFormats **newref)
     FORMATS_CHANGEREF(oldref, newref);
 }
 
-#define SET_COMMON_FORMATS(ctx, fmts, in_fmts, out_fmts, ref_fn, unref_fn, list) \
+#define SET_COMMON_FORMATS(ctx, fmts, ref_fn, unref_fn, list)       \
     int count = 0, i;                                               \
                                                                     \
     if (!fmts)                                                      \
         return AVERROR(ENOMEM);                                     \
                                                                     \
     for (i = 0; i < ctx->nb_inputs; i++) {                          \
-        if (ctx->inputs[i] && !ctx->inputs[i]->out_fmts) {          \
-            int ret = ref_fn(fmts, &ctx->inputs[i]->out_fmts);      \
+        if (ctx->inputs[i] && !ctx->inputs[i]->outcfg.fmts) {       \
+            int ret = ref_fn(fmts, &ctx->inputs[i]->outcfg.fmts);   \
             if (ret < 0) {                                          \
                 unref_fn(&fmts);                                    \
                 if (fmts)                                           \
@@ -569,8 +569,8 @@ void ff_formats_changeref(AVFilterFormats **oldref, AVFilterFormats **newref)
         }                                                           \
     }                                                               \
     for (i = 0; i < ctx->nb_outputs; i++) {                         \
-        if (ctx->outputs[i] && !ctx->outputs[i]->in_fmts) {         \
-            int ret = ref_fn(fmts, &ctx->outputs[i]->in_fmts);      \
+        if (ctx->outputs[i] && !ctx->outputs[i]->incfg.fmts) {      \
+            int ret = ref_fn(fmts, &ctx->outputs[i]->incfg.fmts);   \
             if (ret < 0) {                                          \
                 unref_fn(&fmts);                                    \
                 if (fmts)                                           \
@@ -591,16 +591,16 @@ void ff_formats_changeref(AVFilterFormats **oldref, AVFilterFormats **newref)
     return 0;
 
 int ff_set_common_channel_layouts(AVFilterContext *ctx,
-                                  AVFilterChannelLayouts *layouts)
+                                  AVFilterChannelLayouts *channel_layouts)
 {
-    SET_COMMON_FORMATS(ctx, layouts, incfg.channel_layouts, outcfg.channel_layouts,
+    SET_COMMON_FORMATS(ctx, channel_layouts,
                        ff_channel_layouts_ref, ff_channel_layouts_unref, channel_layouts);
 }
 
 int ff_set_common_samplerates(AVFilterContext *ctx,
                               AVFilterFormats *samplerates)
 {
-    SET_COMMON_FORMATS(ctx, samplerates, incfg.samplerates, outcfg.samplerates,
+    SET_COMMON_FORMATS(ctx, samplerates,
                        ff_formats_ref, ff_formats_unref, formats);
 }
 
@@ -611,7 +611,7 @@ int ff_set_common_samplerates(AVFilterContext *ctx,
  */
 int ff_set_common_formats(AVFilterContext *ctx, AVFilterFormats *formats)
 {
-    SET_COMMON_FORMATS(ctx, formats, incfg.formats, outcfg.formats,
+    SET_COMMON_FORMATS(ctx, formats,
                        ff_formats_ref, ff_formats_unref, formats);
 }
 
-- 
2.28.0