summaryrefslogtreecommitdiff
path: root/libavfilter/src_movie.c
diff options
context:
space:
mode:
authorMuhammad Faiz <mfcc64@gmail.com>2016-06-02 14:50:46 +0700
committerMuhammad Faiz <mfcc64@gmail.com>2016-06-09 02:00:10 +0700
commit2991d935203ed1a193d5624bf88655f7b1abe5ea (patch)
treedc24c51a06bc79a76ea1ff4573a069136d062db8 /libavfilter/src_movie.c
parenta096d3ec4782b5398d73c842a746792e8a124377 (diff)
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 <mfcc64@gmail.com>
Diffstat (limited to 'libavfilter/src_movie.c')
-rw-r--r--libavfilter/src_movie.c6
1 files 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",