highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avconv: switch opening decoders and encoders

Browse Source 
Open decoders first, next encoders. This makes sure that that
subtitle_header is always set properly, without relying on
avformat_find_stream_info() setting it.
This commit is contained in:
Anton Khirnov 2016-01-18 20:00:23 +01:00
parent 9200514ad8
commit 5b9cdf8cba
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
avconv.c
View File

@ -1943,6 +1943,11 @@ static int transcode_init(void)
} }
} }
/* init input streams */
for (i = 0; i < nb_input_streams; i++)
if ((ret = init_input_stream(i, error, sizeof(error))) < 0)
goto dump_format;
/* open each encoder */ /* open each encoder */
for (i = 0; i < nb_output_streams; i++) { for (i = 0; i < nb_output_streams; i++) {
ret = init_output_stream(output_streams[i], error, sizeof(error)); ret = init_output_stream(output_streams[i], error, sizeof(error));
@ -1950,10 +1955,6 @@ static int transcode_init(void)
goto dump_format; goto dump_format;
} }
/* init input streams */
for (i = 0; i < nb_input_streams; i++)
if ((ret = init_input_stream(i, error, sizeof(error))) < 0)
goto dump_format;
/* discard unused programs */ /* discard unused programs */
for (i = 0; i < nb_input_files; i++) { for (i = 0; i < nb_input_files; i++) {