From e0dd8cadcc386a168e7acd079463880154086446 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Thu, 28 Mar 2013 15:12:47 +0100
Subject: af_join: fix channel count and format

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
 libavfilter/af_join.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'libavfilter')

diff --git a/libavfilter/af_join.c b/libavfilter/af_join.c
index 8dffda0a31..ac3b76ca9d 100644
--- a/libavfilter/af_join.c
+++ b/libavfilter/af_join.c
@@ -476,6 +476,8 @@ static int join_request_frame(AVFilterLink *outlink)
 
     frame->nb_samples     = nb_samples;
     frame->channel_layout = outlink->channel_layout;
+    av_frame_set_channels(frame, outlink->channels);
+    frame->format         = outlink->format;
     frame->sample_rate    = outlink->sample_rate;
     frame->pts            = s->input_frames[0]->pts;
     frame->linesize[0]    = linesize;
-- 
cgit v1.2.3