virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

fftools/ffmpeg: remove unused function arguments

Browse Source
This commit is contained in:
Anton Khirnov
2023-04-18 10:53:12 +02:00
parent ecb44ca877
commit ab0d2052a3
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fftools/ffmpeg_mux.c
View File

@@ -261,7 +261,7 @@ finish:
return ret == AVERROR_EOF ? 0 : ret; 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); MuxStream *ms = ms_from_ost(ost);
AVPacket *tmp_pkt = NULL; 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); return thread_submit_packet(mux, ost, pkt);
} else { } else {
/* the muxer is not initialized yet, buffer the packet */ /* the muxer is not initialized yet, buffer the packet */
ret = queue_packet(mux, ost, pkt); ret = queue_packet(ost, pkt);
if (ret < 0) { if (ret < 0) {
if (pkt) if (pkt)
av_packet_unref(pkt); av_packet_unref(pkt);

9
fftools/ffmpeg_mux_init.c
View File

@@ -839,8 +839,7 @@ static void new_stream_subtitle(Muxer *mux, const OptionsContext *o,
} }
} }
static int streamcopy_init(const Muxer *mux, const OptionsContext *o, static int streamcopy_init(const Muxer *mux, OutputStream *ost)
OutputStream *ost)
{ {
MuxStream *ms = ms_from_ost(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) { if (ost->ist && !ost->enc) {
ret = streamcopy_init(mux, o, ost); ret = streamcopy_init(mux, ost);
if (ret < 0) if (ret < 0)
exit_program(1); 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, static int copy_metadata(Muxer *mux, AVFormatContext *ic,
const char *outspec, const char *inspec, const char *outspec, const char *inspec,
int *metadata_global_manual, int *metadata_streams_manual, int *metadata_global_manual, int *metadata_streams_manual,
int *metadata_chapters_manual, const OptionsContext *o) int *metadata_chapters_manual)
{ {
AVFormatContext *oc = mux->fc; AVFormatContext *oc = mux->fc;
AVDictionary **meta_in = NULL; 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, in_file_index >= 0 ? input_files[in_file_index]->ctx : NULL,
o->metadata_map[i].specifier, *p ? p + 1 : p, o->metadata_map[i].specifier, *p ? p + 1 : p,
&metadata_global_manual, &metadata_streams_manual, &metadata_global_manual, &metadata_streams_manual,
&metadata_chapters_manual, o); &metadata_chapters_manual);
} }
/* copy chapters */ /* copy chapters */