[FFmpeg-cvslog] avfilter/af_amerge: use already provided outlink

Paul B Mahol git at videolan.org
Tue Nov 28 14:15:16 EET 2023


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Tue Nov 28 12:50:10 2023 +0100| [8b9c400f1d63eae28b1142eb998012b5327d95f9] | committer: Paul B Mahol

avfilter/af_amerge: use already provided outlink

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8b9c400f1d63eae28b1142eb998012b5327d95f9
---

 libavfilter/af_amerge.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c
index 6ef05e213f..83318f99e4 100644
--- a/libavfilter/af_amerge.c
+++ b/libavfilter/af_amerge.c
@@ -156,7 +156,7 @@ static int config_output(AVFilterLink *outlink)
     char buf[128];
     int i;
 
-    s->bps = av_get_bytes_per_sample(ctx->outputs[0]->format);
+    s->bps = av_get_bytes_per_sample(outlink->format);
     outlink->time_base   = ctx->inputs[0]->time_base;
 
     av_bprint_init(&bp, 0, AV_BPRINT_SIZE_AUTOMATIC);
@@ -166,7 +166,7 @@ static int config_output(AVFilterLink *outlink)
         av_bprintf(&bp, "%s", buf);
     }
     av_bprintf(&bp, " -> out:");
-    av_channel_layout_describe(&ctx->outputs[0]->ch_layout, buf, sizeof(buf));
+    av_channel_layout_describe(&outlink->ch_layout, buf, sizeof(buf));
     av_bprintf(&bp, "%s", buf);
     av_log(ctx, AV_LOG_VERBOSE, "%s\n", bp.str);
 
@@ -234,7 +234,7 @@ static int try_push_frame(AVFilterContext *ctx, int nb_samples)
         ins[i] = inbuf[i]->data[0];
     }
 
-    outbuf = ff_get_audio_buffer(ctx->outputs[0], nb_samples);
+    outbuf = ff_get_audio_buffer(outlink, nb_samples);
     if (!outbuf) {
         free_frames(s->nb_inputs, inbuf);
         return AVERROR(ENOMEM);
@@ -279,7 +279,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
     }
 
     free_frames(s->nb_inputs, inbuf);
-    return ff_filter_frame(ctx->outputs[0], outbuf);
+    return ff_filter_frame(outlink, outbuf);
 }
 
 static int activate(AVFilterContext *ctx)



More information about the ffmpeg-cvslog mailing list