[FFmpeg-cvslog] af_join: Set the output frame format

[Luca Barbato]

ffmpeg | branch: master | Luca Barbato <lu_zero at gentoo.org> | Fri Aug  1 22:27:13 2014 +0200| [87efaa97ceb0ad5820870855d6df3e569e6eac7e] | committer: Luca Barbato

af_join: Set the output frame format

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

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

diff --git a/libavfilter/af_join.c b/libavfilter/af_join.c
index ee87340..e684cb9 100644
--- a/libavfilter/af_join.c
+++ b/libavfilter/af_join.c
@@ -480,6 +480,7 @@ static int join_request_frame(AVFilterLink *outlink)
     frame->nb_samples     = nb_samples;
     frame->channel_layout = outlink->channel_layout;
     frame->sample_rate    = outlink->sample_rate;
+    frame->format         = outlink->format;
     frame->pts            = s->input_frames[0]->pts;
     frame->linesize[0]    = linesize;
     if (frame->data != frame->extended_data) {