X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=mp4.c;h=5ca1307f680d366c155b2e98257ba807c5a4fb92;hb=HEAD;hp=f8515ca290681a271155e9749d903ea9214b9b13;hpb=81bc7110ff6a4c2d002618b94fcf5aa60cd4cad2;p=paraslash.git diff --git a/mp4.c b/mp4.c index f8515ca2..fe9d4b37 100644 --- a/mp4.c +++ b/mp4.c @@ -131,7 +131,8 @@ static int read_int16(struct mp4 *f, uint16_t *result) return ret; } -/** A macro defining the atoms we care about. It gets expanded twice. */ +/** \cond atom_items */ +/* A macro defining the atoms we care about. It gets expanded twice. */ #define ATOM_ITEMS \ ATOM_ITEM(MOOV, 'm', 'o', 'o', 'v') /* movie (top-level container) */ \ ATOM_ITEM(TRAK, 't', 'r', 'a', 'k') /* container for a single track */ \ @@ -155,6 +156,8 @@ static int read_int16(struct mp4 *f, uint16_t *result) ATOM_ITEM(META, 'm', 'e', 't', 'a') /* iTunes Metadata box */ \ ATOM_ITEM(DATA, 'd', 'a', 't', 'a') /* iTunes Metadata data box */ \ +/** \endcond atom_items */ + /** For the C enumeration we concatenate ATOM_ with the first argument. */ #define ATOM_ITEM(_name, a, b, c, d) ATOM_ ## _name, /** The enumeration of interesting atoms. */ @@ -1044,7 +1047,7 @@ free_moov: * function also returns NULL. Otherwise a copy of the tag value is returned * and the caller should free this memory when it is no longer needed. */ -char *mp4_get_tag_value(const struct mp4 *f, const char *item) +__malloc char *mp4_get_tag_value(const struct mp4 *f, const char *item) { for (unsigned n = 0; n < f->meta.count; n++) if (!strcasecmp(f->meta.tags[n].item, item))