Browse Source

ffmpeg: init input streams before opening encoders

Codec options of streams detected during avformat_find_stream_info are not set
therefore without this patch we initialize the encoders with decoder info
based on decoders without options.

This cause problems for probed DVB teletext streams where
avctx->subtitle_header depend on the txt_format setting.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
tags/n3.1
Marton Balint 9 years ago
parent
commit
308ac2f7e2
1 changed files with 7 additions and 7 deletions
  1. +7
    -7
      ffmpeg.c

+ 7
- 7
ffmpeg.c View File

@@ -3198,13 +3198,6 @@ static int transcode_init(void)
}
}

/* open each encoder */
for (i = 0; i < nb_output_streams; i++) {
ret = init_output_stream(output_streams[i], error, sizeof(error));
if (ret < 0)
goto dump_format;
}

/* init input streams */
for (i = 0; i < nb_input_streams; i++)
if ((ret = init_input_stream(i, error, sizeof(error))) < 0) {
@@ -3215,6 +3208,13 @@ static int transcode_init(void)
goto dump_format;
}

/* open each encoder */
for (i = 0; i < nb_output_streams; i++) {
ret = init_output_stream(output_streams[i], error, sizeof(error));
if (ret < 0)
goto dump_format;
}

/* discard unused programs */
for (i = 0; i < nb_input_files; i++) {
InputFile *ifile = input_files[i];


Loading…
Cancel
Save