comparison mp3.c @ 5641:980dc98901d9 libavformat

mp3: ftell() file offset for VBR tags before ID3v1 parser messes it up.
author andoma
date Wed, 10 Feb 2010 12:44:16 +0000
parents 27fd77f20a89
children 6d530eb42996
comparison
equal deleted inserted replaced
5640:60f12d6e951c 5641:980dc98901d9
145 145
146 // lcm of all mp3 sample rates 146 // lcm of all mp3 sample rates
147 av_set_pts_info(st, 64, 1, 14112000); 147 av_set_pts_info(st, 64, 1, 14112000);
148 148
149 ff_id3v2_read(s); 149 ff_id3v2_read(s);
150 off = url_ftell(s->pb);
151
150 if (!av_metadata_get(s->metadata, "", NULL, AV_METADATA_IGNORE_SUFFIX)) 152 if (!av_metadata_get(s->metadata, "", NULL, AV_METADATA_IGNORE_SUFFIX))
151 ff_id3v1_read(s); 153 ff_id3v1_read(s);
152 154
153 off = url_ftell(s->pb);
154 if (mp3_parse_vbr_tags(s, st, off) < 0) 155 if (mp3_parse_vbr_tags(s, st, off) < 0)
155 url_fseek(s->pb, off, SEEK_SET); 156 url_fseek(s->pb, off, SEEK_SET);
156 157
157 /* the parameters will be extracted from the compressed bitstream */ 158 /* the parameters will be extracted from the compressed bitstream */
158 return 0; 159 return 0;