# HG changeset patch
# User rbultje
# Date 1270496815 0
# Node ID 854b3ac40b8eea8dde0b612764f5e2e99541a853
# Parent  97fce92200b590fd2901266cac920f0fbba33862
Add a flag to not overwrite existing tags

Patch by Anton Khirnov <wyskas gmail com>.

diff -r 97fce92200b5 -r 854b3ac40b8e avformat.h
--- a/avformat.h	Mon Apr 05 17:26:06 2010 +0000
+++ b/avformat.h	Mon Apr 05 19:46:55 2010 +0000
@@ -22,7 +22,7 @@
 #define AVFORMAT_AVFORMAT_H
 
 #define LIBAVFORMAT_VERSION_MAJOR 52
-#define LIBAVFORMAT_VERSION_MINOR 60
+#define LIBAVFORMAT_VERSION_MINOR 61
 #define LIBAVFORMAT_VERSION_MICRO  0
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
diff -r 97fce92200b5 -r 854b3ac40b8e metadata.c
--- a/metadata.c	Mon Apr 05 17:26:06 2010 +0000
+++ b/metadata.c	Mon Apr 05 19:46:55 2010 +0000
@@ -55,6 +55,8 @@
         m=*pm= av_mallocz(sizeof(*m));
 
     if(tag){
+        if (flags & AV_METADATA_DONT_OVERWRITE)
+            return 0;
         av_free(tag->value);
         av_free(tag->key);
         *tag= m->elems[--m->count];