RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fftools/ffmpeg_mux_init: stop using OptionsContext as storage in copy_metadata() 

It should be input-only to this code. Will allow making it const in
future commits.
This commit is contained in:
Anton Khirnov 2022-10-18 12:05:37 +02:00
parent 3c7dd5ed37
commit 4119480681
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fftools/ffmpeg.h
View File

@ -149,9 +149,6 @@ typedef struct OptionsContext {
AudioChannelMap *audio_channel_maps; /* one info entry per -map_channel */
int nb_audio_channel_maps; /* number of (valid) -map_channel settings */
#endif
int metadata_global_manual;
int metadata_streams_manual;
int metadata_chapters_manual;
const char **attachments;
int nb_attachments;

24
fftools/ffmpeg_mux_init.c
View File

@ -1494,7 +1494,10 @@ static int copy_chapters(InputFile *ifile, OutputFile *ofile, AVFormatContext *o
return 0;
}
static int copy_metadata(const char *outspec, const char *inspec, AVFormatContext *oc, AVFormatContext *ic, OptionsContext *o)
static int copy_metadata(const char *outspec, const char *inspec,
AVFormatContext *oc, AVFormatContext *ic,
int *metadata_global_manual, int *metadata_streams_manual,
int *metadata_chapters_manual, OptionsContext *o)
{
AVDictionary **meta_in = NULL;
AVDictionary **meta_out = NULL;
@ -1507,11 +1510,11 @@ static int copy_metadata(const char *outspec, const char *inspec, AVFormatContex
parse_meta_type(outspec, &type_out, &idx_out, &ostream_spec);
if (type_in == 'g' || type_out == 'g')
o->metadata_global_manual = 1;
*metadata_global_manual = 1;
if (type_in == 's' || type_out == 's')
o->metadata_streams_manual = 1;
*metadata_streams_manual = 1;
if (type_in == 'c' || type_out == 'c')
o->metadata_chapters_manual = 1;
*metadata_chapters_manual = 1;
/* ic is NULL when just disabling automatic mappings */
if (!ic)
@ -1579,6 +1582,9 @@ static void copy_meta(Muxer *mux, OptionsContext *o)
OutputFile *of = &mux->of;
AVFormatContext *oc = mux->fc;
int chapters_input_file = o->chapters_input_file;
int metadata_global_manual = 0;
int metadata_streams_manual = 0;
int metadata_chapters_manual = 0;
/* copy metadata */
for (int i = 0; i < o->nb_metadata_map; i++) {
@ -1591,7 +1597,9 @@ static void copy_meta(Muxer *mux, OptionsContext *o)
}
copy_metadata(o->metadata_map[i].specifier, *p ? p + 1 : p, oc,
in_file_index >= 0 ?
input_files[in_file_index]->ctx : NULL, o);
input_files[in_file_index]->ctx : NULL,
&metadata_global_manual, &metadata_streams_manual,
&metadata_chapters_manual, o);
}
/* copy chapters */
@ -1612,10 +1620,10 @@ static void copy_meta(Muxer *mux, OptionsContext *o)
}
if (chapters_input_file >= 0)
copy_chapters(input_files[chapters_input_file], of, oc,
!o->metadata_chapters_manual);
!metadata_chapters_manual);
/* copy global metadata by default */
if (!o->metadata_global_manual && nb_input_files){
if (!metadata_global_manual && nb_input_files){
av_dict_copy(&oc->metadata, input_files[0]->ctx->metadata,
AV_DICT_DONT_OVERWRITE);
if (of->recording_time != INT64_MAX)
@ -1625,7 +1633,7 @@ static void copy_meta(Muxer *mux, OptionsContext *o)
av_dict_set(&oc->metadata, "product_name", NULL, 0);
av_dict_set(&oc->metadata, "product_version", NULL, 0);
}
if (!o->metadata_streams_manual)
if (!metadata_streams_manual)
for (int i = 0; i < of->nb_streams; i++) {
OutputStream *ost = of->streams[i];
InputStream *ist;