Mercurial > libavformat.hg

changeset 5938:854b3ac40b8e libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add a flag to not overwrite existing tags Patch by Anton Khirnov <wyskas gmail com>.
author rbultje
date Mon, 05 Apr 2010 19:46:55 +0000
parents 97fce92200b5
children b8a234311fc1
files avformat.h metadata.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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, \
--- 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];