From 0add05bd3ad93f3672cdf1004f30e96d29a5c470 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Tue, 18 Apr 2023 15:00:11 +0200 Subject: [PATCH] fftools/ffmpeg_mux_init: rename init_output_filter() to ost_add_from_filter() The previous name is misleading, because the function does not actually initialize any filters - it creates a new output stream and binds a filtergraph output to it. --- fftools/ffmpeg_mux_init.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index db1f9fa9a6..7a2db9f0e8 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -1242,7 +1242,8 @@ static OutputStream *ost_add(Muxer *mux, const OptionsContext *o, return ost; } -static void init_output_filter(OutputFilter *ofilter, const OptionsContext *o, +// add a new output stream fed by the provided filtergraph output +static void ost_add_from_filter(OutputFilter *ofilter, const OptionsContext *o, Muxer *mux) { OutputStream *ost = ost_add(mux, o, ofilter->type, NULL); @@ -1438,7 +1439,7 @@ loop_end: "in any defined filter graph, or was already used elsewhere.\n", map->linklabel); exit_program(1); } - init_output_filter(ofilter, o, mux); + ost_add_from_filter(ofilter, o, mux); } else { ist = input_files[map->file_index]->streams[map->stream_index]; if (ist->user_set_discard == AVDISCARD_ALL) { @@ -1537,7 +1538,7 @@ static void create_streams(Muxer *mux, const OptionsContext *o) case AVMEDIA_TYPE_AUDIO: auto_disable_a = 1; break; case AVMEDIA_TYPE_SUBTITLE: auto_disable_s = 1; break; } - init_output_filter(ofilter, o, mux); + ost_add_from_filter(ofilter, o, mux); } }