summaryrefslogtreecommitdiffstats
path: root/libavfilter
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-03-28 15:12:47 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-03-28 15:29:14 +0100
commite0dd8cadcc386a168e7acd079463880154086446 (patch)
tree897a4d2a7f5ff01f2b06d424bed9ba2edad373db /libavfilter
parent37bdf33cffd2f3bb4d4c07ef38a5649fd980639f (diff)
downloadffmpeg-streaming-e0dd8cadcc386a168e7acd079463880154086446.zip
ffmpeg-streaming-e0dd8cadcc386a168e7acd079463880154086446.tar.gz
af_join: fix channel count and format
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
-rw-r--r--libavfilter/af_join.c2
1 files changed, 2 insertions, 0 deletions
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;
OpenPOWER on IntegriCloud