Merge commit '87efaa97'

* commit '87efaa97':
  af_join: Set the output frame format

See: e0dd8cad
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavfilter/af_join.c

@@ -470,8 +470,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->format         = outlink->format;
     frame->pts            = s->input_frames[0]->pts;
     frame->linesize[0]    = linesize;
     if (frame->data != frame->extended_data) {