History

Don't overwrite user-supplied metadata with metadata mapped from an input file.

Patch by Anton Khirnov <wyskas gmail com>. Originally committed as revision 22808 to svn://svn.ffmpeg.org/ffmpeg/trunk

Anton Khirnov committed 16 years ago

Commit 1a6498d1 parent 56a82421 file · +1 −1Browse files

Unified · Split

ffmpeg.c+1−1
@@ -2193,7 +2193,7 @@ static int av_transcode(AVFormatContext **output_files, · 2192 unmodified lines
21932193
21942194 mtag=NULL;
21952195 while((mtag=av_metadata_get(in_file->metadata, "", mtag, AV_METADATA_IGNORE_SUFFIX)))
2196− av_metadata_set(&out_file->metadata, mtag->key, mtag->value);
2196+ av_metadata_set2(&out_file->metadata, mtag->key, mtag->value, AV_METADATA_DONT_OVERWRITE);
21972197 av_metadata_conv(out_file, out_file->oformat->metadata_conv,
21982198 in_file->iformat->metadata_conv);
21992199 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t