diff mbox

[FFmpeg-devel,1/2] avfilter/avf_concat: Make independent of the channel layout

Message ID 20160905231353.32269-1-michael@niedermayer.cc
State Accepted
Commit 054f912c0d73c54625a0b186e597f7db82b563fb
Headers show

Commit Message

Michael Niedermayer Sept. 5, 2016, 11:13 p.m. UTC 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavfilter/avf_concat.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Nicolas George Sept. 10, 2016, 9:22 a.m. UTC | #1 
Le primidi 21 fructidor, an CCXXIV, Michael Niedermayer a écrit :
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavfilter/avf_concat.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)

LGTM.

Regards,
Michael Niedermayer Sept. 10, 2016, 8:43 p.m. UTC | #2 
On Sat, Sep 10, 2016 at 11:22:33AM +0200, Nicolas George wrote:
> Le primidi 21 fructidor, an CCXXIV, Michael Niedermayer a écrit :
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > ---
> >  libavfilter/avf_concat.c | 3 +--
> >  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> LGTM.

applied

thx

[...]
diff mbox

Patch

diff --git a/libavfilter/avf_concat.c b/libavfilter/avf_concat.c
index 4fa9447..56e4179 100644
--- a/libavfilter/avf_concat.c
+++ b/libavfilter/avf_concat.c
@@ -260,7 +260,6 @@  static int send_silence(AVFilterContext *ctx, unsigned in_no, unsigned out_no,
     int frame_nb_samples, ret;
     AVRational rate_tb = { 1, ctx->inputs[in_no]->sample_rate };
     AVFrame *buf;
-    int nb_channels = av_get_channel_layout_nb_channels(outlink->channel_layout);
 
     if (!rate_tb.den)
         return AVERROR_BUG;
@@ -273,7 +272,7 @@  static int send_silence(AVFilterContext *ctx, unsigned in_no, unsigned out_no,
         if (!buf)
             return AVERROR(ENOMEM);
         av_samples_set_silence(buf->extended_data, 0, frame_nb_samples,
-                               nb_channels, outlink->format);
+                               outlink->channels, outlink->format);
         buf->pts = base_pts + av_rescale_q(sent, rate_tb, outlink->time_base);
         ret = ff_filter_frame(outlink, buf);
         if (ret < 0)