diff avformat.h @ 4154:bd4d3fee45d0 libavformat

rename AVMetaData to AVMetadata and meta_data to metadata
author aurel
date Sun, 04 Jan 2009 23:31:31 +0000
parents 74f56dba37d3
children ccc2608599a5
line wrap: on
line diff
--- a/avformat.h	Sun Jan 04 22:31:55 2009 +0000
+++ b/avformat.h	Sun Jan 04 23:31:31 2009 +0000
@@ -73,9 +73,9 @@
 typedef struct {
     char *key;
     char *value;
-}AVMetaDataTag;
+}AVMetadataTag;
 
-struct AVMetaData;
+struct AVMetadata;
 
 /**
  * gets a metadata element with matching key.
@@ -83,15 +83,15 @@
  * @param flags allows case as well as suffix insensitive comparissions.
  * @return found tag or NULL, changing key or value leads to undefined behavior.
  */
-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);
 
 /**
  * sets the given tag in m, overwriting an existing tag.
  * @param tag tag to add to m, key and value will be av_strduped.
  * @return >= 0 if success otherwise error code that is <0.
  */
-int av_metadata_set(struct AVMetaData **m, AVMetaDataTag tag);
+int av_metadata_set(struct AVMetadata **m, AVMetadataTag tag);
 
 
 /* packet functions */
@@ -481,7 +481,7 @@
      */
     AVRational sample_aspect_ratio;
 
-    struct AVMetaData *meta_data;
+    struct AVMetadata *metadata;
 } AVStream;
 
 #define AV_PROGRAM_RUNNING 1
@@ -500,7 +500,7 @@
     enum AVDiscard discard;        ///< selects which program to discard and which to feed to the caller
     unsigned int   *stream_index;
     unsigned int   nb_stream_indexes;
-    struct AVMetaData *meta_data;
+    struct AVMetadata *metadata;
 } AVProgram;
 
 #define AVFMTCTX_NOHEADER      0x0001 /**< signal that no header is present
@@ -511,7 +511,7 @@
     AVRational time_base;   ///< time base in which the start/end timestamps are specified
     int64_t start, end;     ///< chapter start/end time in time_base units
     char *title;            ///< chapter title
-    struct AVMetaData *meta_data;
+    struct AVMetadata *metadata;
 } AVChapter;
 
 #define MAX_STREAMS 20
@@ -661,7 +661,7 @@
 
     struct AVPacketList *packet_buffer_end;
 
-    struct AVMetaData *meta_data;
+    struct AVMetadata *metadata;
 } AVFormatContext;
 
 typedef struct AVPacketList {