Merge commit '87efaa97ceb0ad5820870855d6df3e569e6eac7e'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 2 Aug 2014 02:37:56 +0000 (04:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 2 Aug 2014 02:45:26 +0000 (04:45 +0200)
* commit '87efaa97ceb0ad5820870855d6df3e569e6eac7e':
  af_join: Set the output frame format

See: e0dd8cadcc386a168e7acd079463880154086446
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavfilter/af_join.c

@@@ -469,9 -479,8 +469,9 @@@ static int join_request_frame(AVFilterL
  
      frame->nb_samples     = nb_samples;
      frame->channel_layout = outlink->channel_layout;
-     frame->format         = outlink->format;
 +    av_frame_set_channels(frame, outlink->channels);
      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) {