videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

Simplify writing stream metadata. 

Patch by Anton Khirnov <wyskas gmail com>.

Originally committed as revision 22809 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Anton Khirnov 2010-04-05 19:54:11 +00:00 committed by Ronald S. Bultje
parent 1a6498d78c
commit 46e6fb4c54
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ffmpeg.c
View File

@ -1914,7 +1914,7 @@ static int av_transcode(AVFormatContext **output_files,
/* for each output stream, we compute the right encoding parameters */
for(i=0;i<nb_ostreams;i++) {
AVMetadataTag *t = NULL, *lang = NULL;
AVMetadataTag *t = NULL;
ost = ost_table[i];
os = output_files[ost->file_index];
ist = ist_table[ost->source_index];
@ -1922,12 +1922,8 @@ static int av_transcode(AVFormatContext **output_files,
codec = ost->st->codec;
icodec = ist->st->codec;
if (av_metadata_get(ist->st->metadata, "language", NULL, 0))
lang = av_metadata_get(ost->st->metadata, "language", NULL, 0);
while ((t = av_metadata_get(ist->st->metadata, "", t, AV_METADATA_IGNORE_SUFFIX))) {
if (lang && !strcmp(t->key, "language"))
continue;
av_metadata_set2(&ost->st->metadata, t->key, t->value, 0);
av_metadata_set2(&ost->st->metadata, t->key, t->value, AV_METADATA_DONT_OVERWRITE);
}
ost->st->disposition = ist->st->disposition;