virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avfilter/src_movie: call open_stream after guess_channel_layout

Browse Source 
fix error 'Channel layout change is not supported' when
opening wav file

Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
This commit is contained in:
Muhammad Faiz
2016-06-02 14:50:46 +07:00
parent a096d3ec47
commit 2991d93520
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavfilter/src_movie.c
View File

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