avfilter/src_movie: call open_stream after guess_channel_layout
authorMuhammad Faiz <mfcc64@gmail.com>
Thu, 2 Jun 2016 07:50:46 +0000 (14:50 +0700)
committerMuhammad Faiz <mfcc64@gmail.com>
Wed, 8 Jun 2016 19:00:10 +0000 (02:00 +0700)
fix error 'Channel layout change is not supported' when
opening wav file

Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
libavfilter/src_movie.c

index 9ac115b..4714ca9 100644 (file)
@@ -303,15 +303,15 @@ static av_cold int movie_common_init(AVFilterContext *ctx)
         pad.config_props  = movie_config_output_props;
         pad.request_frame = movie_request_frame;
         ff_insert_outpad(ctx, i, &pad);
-        ret = open_stream(ctx, &movie->st[i]);
-        if (ret < 0)
-            return ret;
         if ( movie->st[i].st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO &&
             !movie->st[i].st->codecpar->channel_layout) {
             ret = guess_channel_layout(&movie->st[i], i, ctx);
             if (ret < 0)
                 return ret;
         }
+        ret = open_stream(ctx, &movie->st[i]);
+        if (ret < 0)
+            return ret;
     }
 
     av_log(ctx, AV_LOG_VERBOSE, "seek_point:%"PRIi64" format_name:%s file_name:%s stream_index:%d\n",