Merge commit 'f9edc734e0ca3f6ef06c1ad0bd2c19c0c66f1ffa'

[ffmpeg] / libavfilter / af_amerge.c

diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c
index 8ea01e206bd55766fce541fd96bfde43a0c472ba..3cf36b30380866b998ace5deea337cc80fd20a99 100644 (file)
--- a/libavfilter/af_amerge.c
+++ b/libavfilter/af_amerge.c
@@ -280,7 +280,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
 
     outbuf->nb_samples     = nb_samples;
     outbuf->channel_layout = outlink->channel_layout;
-    av_frame_set_channels(outbuf, outlink->channels);
+    outbuf->channels       = outlink->channels;
 
     while (nb_samples) {
         ns = nb_samples;