From a1526cd78f6da69a4ffab897a07e536d2469f222 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reimar=20D=C3=B6ffinger?= Date: Sun, 25 Sep 2011 16:58:38 +0200 Subject: [PATCH] id3v2: Fix some (function) pointer types. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Reimar Döffinger Signed-off-by: Michael Niedermayer --- libavformat/id3v2.c | 5 +++-- libavformat/id3v2.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index dfa9a71443..9d7ceef5a4 100644 --- a/libavformat/id3v2.c +++ b/libavformat/id3v2.c @@ -69,8 +69,9 @@ static unsigned int get_size(AVIOContext *s, int len) /** * Free GEOB type extra metadata. */ -static void free_geobtag(ID3v2ExtraMetaGEOB *geob) +static void free_geobtag(void *obj) { + ID3v2ExtraMetaGEOB *geob = obj; av_free(geob->mime_type); av_free(geob->file_name); av_free(geob->description); @@ -518,7 +519,7 @@ void ff_id3v2_read(AVFormatContext *s, const char *magic) void ff_id3v2_free_extra_meta(ID3v2ExtraMeta **extra_meta) { ID3v2ExtraMeta *current = *extra_meta, *next; - void (*free_func)(ID3v2ExtraMeta*); + void (*free_func)(void *); while (current) { if ((free_func = get_extra_meta_func(current->tag, 1)->free)) diff --git a/libavformat/id3v2.h b/libavformat/id3v2.h index a30a74f5fd..76c00d108e 100644 --- a/libavformat/id3v2.h +++ b/libavformat/id3v2.h @@ -63,7 +63,7 @@ typedef struct ID3v2EMFunc { const char *tag3; const char *tag4; void (*read)(AVFormatContext*, AVIOContext*, int, char*, ID3v2ExtraMeta **); - void (*free)(); + void (*free)(void *); } ID3v2EMFunc; /**