[FFmpeg-devel] [PATCH 04/24] ffmpeg: store the output file index in OutputFile

Anton Khirnov anton at khirnov.net
Mon Dec 13 17:20:22 EET 2021


Use it to simplify check_init_output_file(). Will allow further
simplifications in the following commits.
---
 fftools/ffmpeg.c     | 10 +++++-----
 fftools/ffmpeg.h     |  2 ++
 fftools/ffmpeg_opt.c |  1 +
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index fb017a1e37..564ab01335 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -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;
         }
diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h
index 9b200b806a..5fd5d2606b 100644
--- a/fftools/ffmpeg.h
+++ b/fftools/ffmpeg.h
@@ -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 */
diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c
index f638edace9..e8db515e0c 100644
--- a/fftools/ffmpeg_opt.c
+++ b/fftools/ffmpeg_opt.c
@@ -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;
-- 
2.33.0



More information about the ffmpeg-devel mailing list