virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

Add a flag to not overwrite existing tags

Browse Source 
Patch by Anton Khirnov <wyskas gmail com>.

Originally committed as revision 22806 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Anton Khirnov 2010-04-05 19:46:55 +00:00 committed by Ronald S. Bultje
parent 0950e1703b
commit 3dd6180fc7
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/APIchanges
View File

@ -12,6 +12,10 @@ libavutil: 2009-03-08
API changes, most recent first: API changes, most recent first:
2010-04-01 - rxxxxx - lavf 52.61.0 - metadata API
Add a flag for av_metadata_set2() to disable overwriting of
existing tags.
2010-04-01 - r22753 - lavc 52.66.0 2010-04-01 - r22753 - lavc 52.66.0
Add avcodec_get_edge_width() Add avcodec_get_edge_width()

2
libavformat/avformat.h
View File

@ -22,7 +22,7 @@
#define AVFORMAT_AVFORMAT_H #define AVFORMAT_AVFORMAT_H
#define LIBAVFORMAT_VERSION_MAJOR 52 #define LIBAVFORMAT_VERSION_MAJOR 52
#define LIBAVFORMAT_VERSION_MINOR 60 #define LIBAVFORMAT_VERSION_MINOR 61
#define LIBAVFORMAT_VERSION_MICRO 0 #define LIBAVFORMAT_VERSION_MICRO 0
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \

2
libavformat/metadata.c
View File

@ -55,6 +55,8 @@ int av_metadata_set2(AVMetadata **pm, const char *key, const char *value, int fl
m=*pm= av_mallocz(sizeof(*m)); m=*pm= av_mallocz(sizeof(*m));
if(tag){ if(tag){
if (flags & AV_METADATA_DONT_OVERWRITE)
return 0;
av_free(tag->value); av_free(tag->value);
av_free(tag->key); av_free(tag->key);
*tag= m->elems[--m->count]; *tag= m->elems[--m->count];