@@ -2937,7 +2937,7 @@ static int compare_int64(const void *a, const void *b)
}
/* open the muxer when all the streams are initialized */
-static int check_init_output_file(OutputFile *of, int file_index)
+static int check_init_output_file(OutputFile *of)
{
int ret, i;
@@ -2952,13 +2952,13 @@ static int check_init_output_file(OutputFile *of, int file_index)
av_log(NULL, AV_LOG_ERROR,
"Could not write header for output file #%d "
"(incorrect codec parameters ?): %s\n",
- file_index, av_err2str(ret));
+ of->index, av_err2str(ret));
return ret;
}
//assert_avoptions(of->opts);
of->header_written = 1;
- av_dump_format(of->ctx, file_index, of->ctx->url, 1);
+ av_dump_format(of->ctx, of->index, of->ctx->url, 1);
nb_output_dumped++;
if (sdp_filename || want_sdp) {
@@ -3561,7 +3561,7 @@ static int init_output_stream(OutputStream *ost, AVFrame *frame,
ost->initialized = 1;
- ret = check_init_output_file(output_files[ost->file_index], ost->file_index);
+ ret = check_init_output_file(output_files[ost->file_index]);
if (ret < 0)
return ret;
@@ -3664,7 +3664,7 @@ static int transcode_init(void)
for (i = 0; i < nb_output_files; i++) {
oc = output_files[i]->ctx;
if (oc->oformat->flags & AVFMT_NOSTREAMS && oc->nb_streams == 0) {
- ret = check_init_output_file(output_files[i], i);
+ ret = check_init_output_file(output_files[i]);
if (ret < 0)
goto dump_format;
}
@@ -574,6 +574,8 @@ typedef struct OutputStream {
} OutputStream;
typedef struct OutputFile {
+ int index;
+
AVFormatContext *ctx;
AVDictionary *opts;
int ost_index; /* index of the first stream in output_streams */
@@ -2283,6 +2283,7 @@ static int open_output_file(OptionsContext *o, const char *filename)
of = ALLOC_ARRAY_ELEM(output_files, nb_output_files);
+ of->index = nb_output_files - 1;
of->ost_index = nb_output_streams;
of->recording_time = o->recording_time;
of->start_time = o->start_time;