Browse Source

add a typedef for AVMetadata

Originally committed as revision 16446 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Aurelien Jacobs 16 years ago
parent
commit
e232c2529e
2 changed files with 10 additions and 10 deletions
  1. +7
    -7
      libavformat/avformat.h
  2. +3
    -3
      libavformat/metadata.c

+ 7
- 7
libavformat/avformat.h View File

@@ -75,7 +75,7 @@ typedef struct {
char *value; char *value;
}AVMetadataTag; }AVMetadataTag;


struct AVMetadata;
typedef struct AVMetadata AVMetadata;


/** /**
* gets a metadata element with matching key. * gets a metadata element with matching key.
@@ -84,14 +84,14 @@ struct AVMetadata;
* @return found tag or NULL, changing key or value leads to undefined behavior. * @return found tag or NULL, changing key or value leads to undefined behavior.
*/ */
AVMetadataTag * AVMetadataTag *
av_metadata_get(struct AVMetadata *m, const char *key, const AVMetadataTag *prev, int flags);
av_metadata_get(AVMetadata *m, const char *key, const AVMetadataTag *prev, int flags);


/** /**
* sets the given tag in m, overwriting an existing tag. * sets the given tag in m, overwriting an existing tag.
* @param tag tag to add to m, key and value will be av_strduped. * @param tag tag to add to m, key and value will be av_strduped.
* @return >= 0 if success otherwise error code that is <0. * @return >= 0 if success otherwise error code that is <0.
*/ */
int av_metadata_set(struct AVMetadata **m, AVMetadataTag tag);
int av_metadata_set(AVMetadata **m, AVMetadataTag tag);




/* packet functions */ /* packet functions */
@@ -481,7 +481,7 @@ typedef struct AVStream {
*/ */
AVRational sample_aspect_ratio; AVRational sample_aspect_ratio;


struct AVMetadata *metadata;
AVMetadata *metadata;
} AVStream; } AVStream;


#define AV_PROGRAM_RUNNING 1 #define AV_PROGRAM_RUNNING 1
@@ -500,7 +500,7 @@ typedef struct AVProgram {
enum AVDiscard discard; ///< selects which program to discard and which to feed to the caller enum AVDiscard discard; ///< selects which program to discard and which to feed to the caller
unsigned int *stream_index; unsigned int *stream_index;
unsigned int nb_stream_indexes; unsigned int nb_stream_indexes;
struct AVMetadata *metadata;
AVMetadata *metadata;
} AVProgram; } AVProgram;


#define AVFMTCTX_NOHEADER 0x0001 /**< signal that no header is present #define AVFMTCTX_NOHEADER 0x0001 /**< signal that no header is present
@@ -511,7 +511,7 @@ typedef struct AVChapter {
AVRational time_base; ///< time base in which the start/end timestamps are specified 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 int64_t start, end; ///< chapter start/end time in time_base units
char *title; ///< chapter title char *title; ///< chapter title
struct AVMetadata *metadata;
AVMetadata *metadata;
} AVChapter; } AVChapter;


#define MAX_STREAMS 20 #define MAX_STREAMS 20
@@ -661,7 +661,7 @@ typedef struct AVFormatContext {


struct AVPacketList *packet_buffer_end; struct AVPacketList *packet_buffer_end;


struct AVMetadata *metadata;
AVMetadata *metadata;
} AVFormatContext; } AVFormatContext;


typedef struct AVPacketList { typedef struct AVPacketList {


+ 3
- 3
libavformat/metadata.c View File

@@ -21,7 +21,7 @@
#include "metadata.h" #include "metadata.h"


AVMetadataTag * AVMetadataTag *
av_metadata_get(struct AVMetadata *m, const char *key, const AVMetadataTag *prev, int flags)
av_metadata_get(AVMetadata *m, const char *key, const AVMetadataTag *prev, int flags)
{ {
unsigned int i, j; unsigned int i, j;


@@ -44,9 +44,9 @@ av_metadata_get(struct AVMetadata *m, const char *key, const AVMetadataTag *prev
return NULL; return NULL;
} }


int av_metadata_set(struct AVMetadata **pm, AVMetadataTag elem)
int av_metadata_set(AVMetadata **pm, AVMetadataTag elem)
{ {
struct AVMetadata *m= *pm;
AVMetadata *m= *pm;
AVMetadataTag *tag= av_metadata_get(m, elem.key, NULL, 0); AVMetadataTag *tag= av_metadata_get(m, elem.key, NULL, 0);


if(!m) if(!m)


Loading…
Cancel
Save