From 80242f9bdb66b398a3bc05d73e30b55a43eb2a14 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20=C3=96man?= Date: Wed, 10 Feb 2010 12:44:16 +0000 Subject: [PATCH] mp3: ftell() file offset for VBR tags before ID3v1 parser messes it up. Originally committed as revision 21737 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/mp3.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/mp3.c b/libavformat/mp3.c index d8742b5ef..e2f230aca 100644 --- a/libavformat/mp3.c +++ b/libavformat/mp3.c @@ -147,10 +147,11 @@ static int mp3_read_header(AVFormatContext *s, av_set_pts_info(st, 64, 1, 14112000); ff_id3v2_read(s); + off = url_ftell(s->pb); + if (!av_metadata_get(s->metadata, "", NULL, AV_METADATA_IGNORE_SUFFIX)) ff_id3v1_read(s); - off = url_ftell(s->pb); if (mp3_parse_vbr_tags(s, st, off) < 0) url_fseek(s->pb, off, SEEK_SET); -- 2.11.0