[FFmpeg-cvslog] af_join: fix channel count and format

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 28 15:12:47 2013 +0100| [e0dd8cadcc386a168e7acd079463880154086446] | committer: Michael Niedermayer

af_join: fix channel count and format

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavfilter/af_join.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavfilter/af_join.c b/libavfilter/af_join.c
index 8dffda0..ac3b76c 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;