[FFmpeg-cvslog] r22808 - trunk/ffmpeg.c

[rbultje]

Author: rbultje
Date: Mon Apr  5 21:53:25 2010
New Revision: 22808

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

Patch by Anton Khirnov <wyskas gmail com>.

Modified:
   trunk/ffmpeg.c

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	Mon Apr  5 21:50:45 2010	(r22807)
+++ trunk/ffmpeg.c	Mon Apr  5 21:53:25 2010	(r22808)
@@ -2193,7 +2193,7 @@ static int av_transcode(AVFormatContext 
 
         mtag=NULL;
         while((mtag=av_metadata_get(in_file->metadata, "", mtag, AV_METADATA_IGNORE_SUFFIX)))
-            av_metadata_set(&out_file->metadata, mtag->key, mtag->value);
+            av_metadata_set2(&out_file->metadata, mtag->key, mtag->value, AV_METADATA_DONT_OVERWRITE);
         av_metadata_conv(out_file, out_file->oformat->metadata_conv,
                                     in_file->iformat->metadata_conv);
     }