From 2991d935203ed1a193d5624bf88655f7b1abe5ea Mon Sep 17 00:00:00 2001 From: Muhammad Faiz Date: Thu, 2 Jun 2016 14:50:46 +0700 Subject: [PATCH] avfilter/src_movie: call open_stream after guess_channel_layout fix error 'Channel layout change is not supported' when opening wav file Signed-off-by: Muhammad Faiz --- libavfilter/src_movie.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c index 9ac115b66e..4714ca9549 100644 --- a/libavfilter/src_movie.c +++ b/libavfilter/src_movie.c @@ -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",