diff options
| author | Andreas Öman <andreas@lonelycoder.com> | 2010-02-10 12:44:16 +0000 |
|---|---|---|
| committer | Andreas Öman <andreas@lonelycoder.com> | 2010-02-10 12:44:16 +0000 |
| commit | 80242f9bdb66b398a3bc05d73e30b55a43eb2a14 (patch) | |
| tree | fbc9159b82fe981d364d16972c9d42168a97733f /libavformat/mp3.c | |
| parent | 19530266a593e68f48802dcc183383ac3bb7c3c7 (diff) | |
| download | ffmpeg-80242f9bdb66b398a3bc05d73e30b55a43eb2a14.tar.gz | |
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
Diffstat (limited to 'libavformat/mp3.c')
| -rw-r--r-- | libavformat/mp3.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/mp3.c b/libavformat/mp3.c index d8742b5ef2..e2f230acad 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); |