From ab0d2052a3cfd14b616d1944fe11b66aab8ce2f8 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Tue, 18 Apr 2023 10:53:12 +0200 Subject: [PATCH] fftools/ffmpeg: remove unused function arguments --- fftools/ffmpeg_mux.c | 4 ++-- fftools/ffmpeg_mux_init.c | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c index fddb783b00..a19f1a1f1e 100644 --- a/fftools/ffmpeg_mux.c +++ b/fftools/ffmpeg_mux.c @@ -261,7 +261,7 @@ finish: return ret == AVERROR_EOF ? 0 : ret; } -static int queue_packet(Muxer *mux, OutputStream *ost, AVPacket *pkt) +static int queue_packet(OutputStream *ost, AVPacket *pkt) { MuxStream *ms = ms_from_ost(ost); AVPacket *tmp_pkt = NULL; @@ -311,7 +311,7 @@ static int submit_packet(Muxer *mux, AVPacket *pkt, OutputStream *ost) return thread_submit_packet(mux, ost, pkt); } else { /* the muxer is not initialized yet, buffer the packet */ - ret = queue_packet(mux, ost, pkt); + ret = queue_packet(ost, pkt); if (ret < 0) { if (pkt) av_packet_unref(pkt); diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index da3dccd6d7..59d9a12c1a 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -839,8 +839,7 @@ static void new_stream_subtitle(Muxer *mux, const OptionsContext *o, } } -static int streamcopy_init(const Muxer *mux, const OptionsContext *o, - OutputStream *ost) +static int streamcopy_init(const Muxer *mux, OutputStream *ost) { MuxStream *ms = ms_from_ost(ost); @@ -1244,7 +1243,7 @@ static OutputStream *ost_add(Muxer *mux, const OptionsContext *o, } if (ost->ist && !ost->enc) { - ret = streamcopy_init(mux, o, ost); + ret = streamcopy_init(mux, ost); if (ret < 0) exit_program(1); } @@ -1946,7 +1945,7 @@ static int copy_chapters(InputFile *ifile, OutputFile *ofile, AVFormatContext *o static int copy_metadata(Muxer *mux, AVFormatContext *ic, const char *outspec, const char *inspec, int *metadata_global_manual, int *metadata_streams_manual, - int *metadata_chapters_manual, const OptionsContext *o) + int *metadata_chapters_manual) { AVFormatContext *oc = mux->fc; AVDictionary **meta_in = NULL; @@ -2050,7 +2049,7 @@ static void copy_meta(Muxer *mux, const OptionsContext *o) in_file_index >= 0 ? input_files[in_file_index]->ctx : NULL, o->metadata_map[i].specifier, *p ? p + 1 : p, &metadata_global_manual, &metadata_streams_manual, - &metadata_chapters_manual, o); + &metadata_chapters_manual); } /* copy chapters */