Revision e356fc57 libavformat/id3v2.c

View differences:

libavformat/id3v2.c
171 171
    unsync = flags & 0x80;
172 172

  
173 173
    if (isv34 && flags & 0x40) /* Extended header present, just skip over it */
174
        url_fskip(s->pb, get_size(s->pb, 4));
174
        avio_seek(s->pb, get_size(s->pb, 4), SEEK_CUR);
175 175

  
176 176
    while (len >= taghdrlen) {
177 177
        unsigned int tflags;
......
205 205

  
206 206
        if (tflags & (ID3v2_FLAG_ENCRYPTION | ID3v2_FLAG_COMPRESSION)) {
207 207
            av_log(s, AV_LOG_WARNING, "Skipping encrypted/compressed ID3v2 frame %s.\n", tag);
208
            url_fskip(s->pb, tlen);
208
            avio_seek(s->pb, tlen, SEEK_CUR);
209 209
        } else if (tag[0] == 'T') {
210 210
            if (unsync || tunsync) {
211 211
                int i, j;
......
226 226
        else if (!tag[0]) {
227 227
            if (tag[1])
228 228
                av_log(s, AV_LOG_WARNING, "invalid frame id, assuming padding");
229
            url_fskip(s->pb, tlen);
229
            avio_seek(s->pb, tlen, SEEK_CUR);
230 230
            break;
231 231
        }
232 232
        /* Skip to end of tag */
......
235 235

  
236 236
    if (len > 0) {
237 237
        /* Skip padding */
238
        url_fskip(s->pb, len);
238
        avio_seek(s->pb, len, SEEK_CUR);
239 239
    }
240 240
    if (version == 4 && flags & 0x10) /* Footer preset, always 10 bytes, skip over it */
241
        url_fskip(s->pb, 10);
241
        avio_seek(s->pb, 10, SEEK_CUR);
242 242

  
243 243
    av_free(buffer);
244 244
    return;
245 245

  
246 246
  error:
247 247
    av_log(s, AV_LOG_INFO, "ID3v2.%d tag skipped, cannot handle %s\n", version, reason);
248
    url_fskip(s->pb, len);
248
    avio_seek(s->pb, len, SEEK_CUR);
249 249
    av_free(buffer);
250 250
}
251 251

  

Also available in: Unified diff