summaryrefslogtreecommitdiff
path: root/libavformat/metadata.c
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2009-01-04 23:31:31 +0000
committerAurelien Jacobs <aurel@gnuage.org>2009-01-04 23:31:31 +0000
commitbc1d2afb3757ef89d23fd3f91202a3400e3c76da (patch)
tree9fd9057c28449a49854c34cd3e8e4ab550de163f /libavformat/metadata.c
parent27cb5cbc1672a8b9f02cee9d805f2e666775e73b (diff)
rename AVMetaData to AVMetadata and meta_data to metadata
Originally committed as revision 16430 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/metadata.c')
-rw-r--r--libavformat/metadata.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libavformat/metadata.c b/libavformat/metadata.c
index d223d7c0d9..0bfac393b3 100644
--- a/libavformat/metadata.c
+++ b/libavformat/metadata.c
@@ -20,8 +20,8 @@
#include "metadata.h"
-AVMetaDataTag *
-av_metadata_get(struct AVMetaData *m, const char *key, const AVMetaDataTag *prev, int flags)
+AVMetadataTag *
+av_metadata_get(struct AVMetadata *m, const char *key, const AVMetadataTag *prev, int flags)
{
unsigned int i, j;
@@ -44,10 +44,10 @@ av_metadata_get(struct AVMetaData *m, const char *key, const AVMetaDataTag *prev
return NULL;
}
-int av_metadata_set(struct AVMetaData **pm, AVMetaDataTag elem)
+int av_metadata_set(struct AVMetadata **pm, AVMetadataTag elem)
{
- struct AVMetaData *m= *pm;
- AVMetaDataTag *tag= av_metadata_get(m, elem.key, NULL, 0);
+ struct AVMetadata *m= *pm;
+ AVMetadataTag *tag= av_metadata_get(m, elem.key, NULL, 0);
if(!m)
m=*pm= av_mallocz(sizeof(*m));
@@ -57,7 +57,7 @@ int av_metadata_set(struct AVMetaData **pm, AVMetaDataTag elem)
av_free(tag->key);
*tag= m->elems[--m->count];
}else{
- AVMetaDataTag *tmp= av_realloc(m->elems, (m->count+1) * sizeof(*m->elems));
+ AVMetadataTag *tmp= av_realloc(m->elems, (m->count+1) * sizeof(*m->elems));
if(tmp){
m->elems= tmp;
}else