Merge commit 'e199a8099411d0992c3ed278287a81f1d791199c'

[ffmpeg] / libavfilter / af_join.c

diff --git a/libavfilter/af_join.c b/libavfilter/af_join.c
index bd780cc379d5ce39afef672d3e51bcd695bdc99b..74ecce052dacf242cc98d083a43e80fbf4c3f9f1 100644 (file)
--- a/libavfilter/af_join.c
+++ b/libavfilter/af_join.c
@@ -491,7 +491,7 @@ static int try_push_frame(AVFilterContext *ctx)
 
     frame->nb_samples     = nb_samples;
     frame->channel_layout = outlink->channel_layout;
-    av_frame_set_channels(frame, outlink->channels);
+    frame->channels       = outlink->channels;
     frame->sample_rate    = outlink->sample_rate;
     frame->format         = outlink->format;
     frame->pts            = s->input_frames[0]->pts;