aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-11-02 09:47:59 +0100
committerAnton Khirnov <anton@khirnov.net>2011-11-02 10:32:37 +0100
commitec22979a1d88bf1c8986ffa3074deac272706e7e (patch)
tree2da98ee8036bace859782c8ad0d761269f91a28d
parent5511ad14fe1cc871a5a256bf801db09cf1cc35f5 (diff)
downloadffmpeg-ec22979a1d88bf1c8986ffa3074deac272706e7e.tar.gz
id3v2: fix type of ID3v2EMFunc.free()
-rw-r--r--libavformat/id3v2.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c
index c593007e87..92f25901e5 100644
--- a/libavformat/id3v2.c
+++ b/libavformat/id3v2.c
@@ -122,8 +122,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);
@@ -384,7 +385,7 @@ typedef struct ID3v2EMFunc {
const char *tag3;
const char *tag4;
void (*read)(AVFormatContext*, AVIOContext*, int, char*, ID3v2ExtraMeta **);
- void (*free)();
+ void (*free)(void *obj);
} ID3v2EMFunc;
static const ID3v2EMFunc id3v2_extra_meta_funcs[] = {