Revision f59d8ff8 libavformat/mov.c

View differences:

libavformat/mov.c
419 419
                    url_fskip(pb, len);
420 420
            }
421 421
        }
422
        url_fseek(pb, next, SEEK_SET);
422
        avio_seek(pb, next, SEEK_SET);
423 423
    }
424 424
    return 0;
425 425
}
......
1840 1840
        uint32_t tag = avio_rl32(pb);
1841 1841
        atom.size -= 4;
1842 1842
        if (tag == MKTAG('h','d','l','r')) {
1843
            url_fseek(pb, -8, SEEK_CUR);
1843
            avio_seek(pb, -8, SEEK_CUR);
1844 1844
            atom.size += 8;
1845 1845
            return mov_read_default(c, pb, atom);
1846 1846
        }
......
2308 2308
        uint16_t ch;
2309 2309
        int len, title_len;
2310 2310

  
2311
        if (url_fseek(sc->pb, sample->pos, SEEK_SET) != sample->pos) {
2311
        if (avio_seek(sc->pb, sample->pos, SEEK_SET) != sample->pos) {
2312 2312
            av_log(s, AV_LOG_ERROR, "Chapter %d not found in file\n", i);
2313 2313
            goto finish;
2314 2314
        }
......
2338 2338
        av_freep(&title);
2339 2339
    }
2340 2340
finish:
2341
    url_fseek(sc->pb, cur_pos, SEEK_SET);
2341
    avio_seek(sc->pb, cur_pos, SEEK_SET);
2342 2342
}
2343 2343

  
2344 2344
static int mov_read_header(AVFormatContext *s, AVFormatParameters *ap)
......
2421 2421
    sc->current_sample++;
2422 2422

  
2423 2423
    if (st->discard != AVDISCARD_ALL) {
2424
        if (url_fseek(sc->pb, sample->pos, SEEK_SET) != sample->pos) {
2424
        if (avio_seek(sc->pb, sample->pos, SEEK_SET) != sample->pos) {
2425 2425
            av_log(mov->fc, AV_LOG_ERROR, "stream %d, offset 0x%"PRIx64": partial file\n",
2426 2426
                   sc->ffindex, sample->pos);
2427 2427
            return -1;

Also available in: Unified diff