Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / ffmpeg / libavfilter / af_join.c

diff --git a/src/third_party/ffmpeg/libavfilter/af_join.c b/src/third_party/ffmpeg/libavfilter/af_join.c
index 3e9ccc8..560c5c8 100644 (file)
--- a/src/third_party/ffmpeg/libavfilter/af_join.c
+++ b/src/third_party/ffmpeg/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) {