Browse Source

avconv: switch opening decoders and encoders

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.
tags/n3.1
Anton Khirnov 9 years ago
parent
commit
5b9cdf8cba
1 changed files with 5 additions and 4 deletions
  1. +5
    -4
      avconv.c

+ 5
- 4
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 */
for (i = 0; i < nb_output_streams; i++) {
ret = init_output_stream(output_streams[i], error, sizeof(error));
@@ -1950,10 +1955,6 @@ static int transcode_init(void)
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 */
for (i = 0; i < nb_input_files; i++) {


Loading…
Cancel
Save