[FFmpeg-cvslog] r21737 - trunk/libavformat/mp3.c

[andoma]

Author: andoma
Date: Wed Feb 10 13:44:16 2010
New Revision: 21737

Log:
mp3: ftell() file offset for VBR tags before ID3v1 parser messes it up.

Modified:
   trunk/libavformat/mp3.c

Modified: trunk/libavformat/mp3.c
==============================================================================
--- trunk/libavformat/mp3.c	Wed Feb 10 03:02:06 2010	(r21736)
+++ trunk/libavformat/mp3.c	Wed Feb 10 13:44:16 2010	(r21737)
@@ -147,10 +147,11 @@ static int mp3_read_header(AVFormatConte
     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);