generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

id3v2: Fix some (function) pointer types.

Browse Source 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Reimar Döffinger 2011-09-25 16:58:38 +02:00 committed by Michael Niedermayer
parent f57b00e897
commit a1526cd78f
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/id3v2.c
View File

@ -69,8 +69,9 @@ static unsigned int get_size(AVIOContext *s, int len)
/** /**
* Free GEOB type extra metadata. * 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->mime_type);
av_free(geob->file_name); av_free(geob->file_name);
av_free(geob->description); 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) void ff_id3v2_free_extra_meta(ID3v2ExtraMeta **extra_meta)
{ {
ID3v2ExtraMeta *current = *extra_meta, *next; ID3v2ExtraMeta *current = *extra_meta, *next;
void (*free_func)(ID3v2ExtraMeta*); void (*free_func)(void *);
while (current) { while (current) {
if ((free_func = get_extra_meta_func(current->tag, 1)->free)) if ((free_func = get_extra_meta_func(current->tag, 1)->free))

2
libavformat/id3v2.h
View File

@ -63,7 +63,7 @@ typedef struct ID3v2EMFunc {
const char *tag3; const char *tag3;
const char *tag4; const char *tag4;
void (*read)(AVFormatContext*, AVIOContext*, int, char*, ID3v2ExtraMeta **); void (*read)(AVFormatContext*, AVIOContext*, int, char*, ID3v2ExtraMeta **);
void (*free)(); void (*free)(void *);
} ID3v2EMFunc; } ID3v2EMFunc;
/** /**