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

id3v2: simplify error handling.

Browse Source 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
This commit is contained in:
Anton Khirnov 2011-03-15 07:54:22 +01:00 committed by Ronald S. Bultje
parent bca6dee386
commit eb1e7f78ea
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/id3v2.c
View File

@ -188,7 +188,7 @@ static void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t
char tag[5]; char tag[5];
int64_t next, end = avio_tell(s->pb) + len; int64_t next, end = avio_tell(s->pb) + len;
int taghdrlen; int taghdrlen;
const char *reason; const char *reason = NULL;
AVIOContext pb; AVIOContext pb;
unsigned char *buffer = NULL; unsigned char *buffer = NULL;
int buffer_size = 0; int buffer_size = 0;
@ -286,14 +286,12 @@ static void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t
if (version == 4 && flags & 0x10) /* Footer preset, always 10 bytes, skip over it */ if (version == 4 && flags & 0x10) /* Footer preset, always 10 bytes, skip over it */
end += 10; end += 10;
error:
if (reason)
av_log(s, AV_LOG_INFO, "ID3v2.%d tag skipped, cannot handle %s\n", version, reason);
avio_seek(s->pb, end, SEEK_SET); avio_seek(s->pb, end, SEEK_SET);
av_free(buffer); av_free(buffer);
return; return;
error:
av_log(s, AV_LOG_INFO, "ID3v2.%d tag skipped, cannot handle %s\n", version, reason);
avio_seek(s->pb, len, SEEK_CUR);
av_free(buffer);
} }
void ff_id3v2_read(AVFormatContext *s, const char *magic) void ff_id3v2_read(AVFormatContext *s, const char *magic)