[FFmpeg-cvslog] avfilter/src_movie: call open_stream after guess_channel_layout
Muhammad Faiz
git at videolan.org
Wed Jun 8 21:06:08 CEST 2016
ffmpeg | branch: master | Muhammad Faiz <mfcc64 at gmail.com> | Thu Jun 2 14:50:46 2016 +0700| [2991d935203ed1a193d5624bf88655f7b1abe5ea] | committer: Muhammad Faiz
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 at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2991d935203ed1a193d5624bf88655f7b1abe5ea
---
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 9ac115b..4714ca9 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",
More information about the ffmpeg-cvslog
mailing list