Add a flag to not overwrite existing tags

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

Anton Khirnov committed 16 years ago

Commit 3dd61801 parent 0950e173 files · +7 −1Browse files

Unified · Split

3 files

doc/APIchanges +4 −0
libavformat/avformat.h +1 −1
libavformat/metadata.c +2 −0

doc/APIchanges+4−0

@@ -12,6 +12,10 @@ libavutil: 2009-03-08 · 11 unmodified lines
12		12
13	API changes, most recent first:	13	API changes, most recent first:
14		14
		15	2010-04-01 - rxxxxx - lavf 52.61.0 - metadata API
		16	Add a flag for av_metadata_set2() to disable overwriting of
		17	existing tags.
		18
15	2010-04-01 - r22753 - lavc 52.66.0	19	2010-04-01 - r22753 - lavc 52.66.0
16	Add avcodec_get_edge_width()	20	Add avcodec_get_edge_width()
17		21

libavformat/avformat.h+1−1

@@ -22,7 +22,7 @@ · 21 unmodified lines
22	#define AVFORMAT_AVFORMAT_H	22	#define AVFORMAT_AVFORMAT_H
23		23
24	#define LIBAVFORMAT_VERSION_MAJOR 52	24	#define LIBAVFORMAT_VERSION_MAJOR 52
25	#define LIBAVFORMAT_VERSION_MINOR 60	25	#define LIBAVFORMAT_VERSION_MINOR 61
26	#define LIBAVFORMAT_VERSION_MICRO 0	26	#define LIBAVFORMAT_VERSION_MICRO 0
27		27
28	#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \	28	#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \

libavformat/metadata.c+2−0

@@ -55,6 +55,8 @@ int av_metadata_set2(AVMetadata *pm, const char key, const char *value, int fl · 54 unmodified lines
55	m=pm= av_mallocz(sizeof(m));	55	m=pm= av_mallocz(sizeof(m));
56		56
57	if(tag){	57	if(tag){
		58	if (flags & AV_METADATA_DONT_OVERWRITE)
		59	return 0;
58	av_free(tag->value);	60	av_free(tag->value);
59	av_free(tag->key);	61	av_free(tag->key);
60	*tag= m->elems[--m->count];	62	*tag= m->elems[--m->count];