diff options
| -rw-r--r-- | libavcodec/Makefile | 1 | ||||
| -rw-r--r-- | libavcodec/avcodec.h | 44 | ||||
| -rw-r--r-- | libavformat/Makefile | 2 | ||||
| -rw-r--r-- | libavformat/avformat.h | 45 | ||||
| -rw-r--r-- | libavformat/metadata.c (renamed from libavcodec/metadata.c) | 0 | ||||
| -rw-r--r-- | libavformat/metadata.h (renamed from libavcodec/metadata.h) | 10 |
6 files changed, 51 insertions, 51 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index d7a1b4ba8e..e4217d6af4 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -14,7 +14,6 @@ OBJS = allcodecs.o \ faanidct.o \ imgconvert.o \ jrevdct.o \ - metadata.o \ opt.o \ parser.o \ raw.o \ diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 7038d2d2c4..7c68a926f6 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -401,50 +401,6 @@ enum SampleFormat { #define FF_MIN_BUFFER_SIZE 16384 -/* - * public Metadata API. - * Important concepts, to keep in mind - * 1. keys are unique, there are never 2 tags with equal keys, this is also - * meant semantically that is a demuxer should not knowingly produce - * several keys that are litterally different but semantically identical, - * like key=Author5, key=Author6. - * All authors have to be placed in the same tag for the case of Authors. - * 2. Metadata is flat, there are no subtags, if you for whatever obscene - * reason want to store the email address of the child of producer alice - * and actor bob, that could have key=alice_and_bobs_childs_email_address. - * 3. A tag whichs value is translated has the ISO 639 3-letter language code - * with a '-' between appended. So for example Author-ger=Michael, Author-eng=Mike - * the original/default language is in the unqualified "Author" - * A demuxer should set a default if it sets any translated tag. - */ - -#define AV_METADATA_IGNORE_CASE 1 -#define AV_METADATA_IGNORE_SUFFIX 2 - -typedef struct { - char *key; - char *value; -}AVMetaDataTag; - -struct AVMetaData; - -/** - * gets a metadata element with matching key. - * @param prev set to the previous matching element to find the next. - * @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); - -/** - * 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); - - /** * motion estimation type. */ diff --git a/libavformat/Makefile b/libavformat/Makefile index f6ef3a71b4..303242d962 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -5,7 +5,7 @@ FFLIBS = avcodec avutil HEADERS = avformat.h avio.h rtsp.h rtspcodes.h -OBJS = allformats.o cutils.o os_support.o sdp.o utils.o +OBJS = allformats.o cutils.o metadata.o os_support.o sdp.o utils.o # muxers/demuxers OBJS-$(CONFIG_AAC_DEMUXER) += raw.o diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 46e692452e..39dc4765a8 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -46,6 +46,51 @@ unsigned avformat_version(void); #include "avio.h" + +/* + * public Metadata API. + * Important concepts, to keep in mind + * 1. keys are unique, there are never 2 tags with equal keys, this is also + * meant semantically that is a demuxer should not knowingly produce + * several keys that are litterally different but semantically identical, + * like key=Author5, key=Author6. + * All authors have to be placed in the same tag for the case of Authors. + * 2. Metadata is flat, there are no subtags, if you for whatever obscene + * reason want to store the email address of the child of producer alice + * and actor bob, that could have key=alice_and_bobs_childs_email_address. + * 3. A tag whichs value is translated has the ISO 639 3-letter language code + * with a '-' between appended. So for example Author-ger=Michael, Author-eng=Mike + * the original/default language is in the unqualified "Author" + * A demuxer should set a default if it sets any translated tag. + */ + +#define AV_METADATA_IGNORE_CASE 1 +#define AV_METADATA_IGNORE_SUFFIX 2 + +typedef struct { + char *key; + char *value; +}AVMetaDataTag; + +struct AVMetaData; + +/** + * gets a metadata element with matching key. + * @param prev set to the previous matching element to find the next. + * @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); + +/** + * 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); + + /* packet functions */ typedef struct AVPacket { diff --git a/libavcodec/metadata.c b/libavformat/metadata.c index d223d7c0d9..d223d7c0d9 100644 --- a/libavcodec/metadata.c +++ b/libavformat/metadata.c diff --git a/libavcodec/metadata.h b/libavformat/metadata.h index 0ab39cba26..e9ada571a1 100644 --- a/libavcodec/metadata.h +++ b/libavformat/metadata.h @@ -18,21 +18,21 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_METADATA_H -#define AVCODEC_METADATA_H +#ifndef AVFORMAT_METADATA_H +#define AVFORMAT_METADATA_H /** * @file metadata.h * internal metadata API header - * see avcodec.h or the public API! + * see avformat.h or the public API! */ -#include "avcodec.h" +#include "avformat.h" struct AVMetaData{ int count; AVMetaDataTag *elems; }; -#endif /* AVCODEC_METADATA_H */ +#endif /* AVFORMAT_METADATA_H */ |