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

fftools/ffmpeg_mux_init: avoid modifying OptionsContext.chapters_input_file 

Use a local variable instead. This will allow making OptionsContext
const in future commits.
This commit is contained in:
Anton Khirnov 2022-10-18 11:52:10 +02:00
parent 5ccc151bf2
commit aa0ce91f57
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fftools/ffmpeg_mux_init.c
View File

@ -1547,6 +1547,7 @@ static void copy_meta(Muxer *mux, OptionsContext *o)
{
OutputFile *of = &mux->of;
AVFormatContext *oc = mux->fc;
int chapters_input_file = o->chapters_input_file;
/* copy metadata */
for (int i = 0; i < o->nb_metadata_map; i++) {
@ -1563,23 +1564,23 @@ static void copy_meta(Muxer *mux, OptionsContext *o)
}
/* copy chapters */
if (o->chapters_input_file >= nb_input_files) {
if (o->chapters_input_file == INT_MAX) {
if (chapters_input_file >= nb_input_files) {
if (chapters_input_file == INT_MAX) {
/* copy chapters from the first input file that has them*/
o->chapters_input_file = -1;
chapters_input_file = -1;
for (int i = 0; i < nb_input_files; i++)
if (input_files[i]->ctx->nb_chapters) {
o->chapters_input_file = i;
chapters_input_file = i;
break;
}
} else {
av_log(NULL, AV_LOG_FATAL, "Invalid input file index %d in chapter mapping.\n",
o->chapters_input_file);
chapters_input_file);
exit_program(1);
}
}
if (o->chapters_input_file >= 0)
copy_chapters(input_files[o->chapters_input_file], of, oc,
if (chapters_input_file >= 0)
copy_chapters(input_files[chapters_input_file], of, oc,
!o->metadata_chapters_manual);
/* copy global metadata by default */