[FFmpeg-cvslog] id3v2: fix type of ID3v2EMFunc.free()

Anton Khirnov git at videolan.org
Thu Nov 3 02:23:07 CET 2011


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Wed Nov  2 09:47:59 2011 +0100| [ec22979a1d88bf1c8986ffa3074deac272706e7e] | committer: Anton Khirnov

id3v2: fix type of ID3v2EMFunc.free()

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ec22979a1d88bf1c8986ffa3074deac272706e7e
---

 libavformat/id3v2.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c
index c593007..92f2590 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[] = {



More information about the ffmpeg-cvslog mailing list