Revision a2704c97 libavformat/oggdec.c

View differences:

libavformat/oggdec.c
62 62
    struct ogg_state *ost =
63 63
        av_malloc(sizeof (*ost) + (ogg->nstreams-1) * sizeof (*ogg->streams));
64 64
    int i;
65
    ost->pos = url_ftell (s->pb);
65
    ost->pos = avio_tell (s->pb);
66 66
    ost->curidx = ogg->curidx;
67 67
    ost->next = ogg->state;
68 68
    ost->nstreams = ogg->nstreams;
......
247 247
    }
248 248

  
249 249
    os = ogg->streams + idx;
250
    os->page_pos = url_ftell(bc) - 27;
250
    os->page_pos = avio_tell(bc) - 27;
251 251

  
252 252
    if(os->psize > 0)
253 253
        ogg_new_buf(ogg, idx);
......
607 607
    avio_seek(bc, *pos_arg, SEEK_SET);
608 608
    ogg_reset(ogg);
609 609

  
610
    while (url_ftell(bc) < pos_limit && !ogg_packet(s, &i, NULL, NULL, pos_arg)) {
610
    while (avio_tell(bc) < pos_limit && !ogg_packet(s, &i, NULL, NULL, pos_arg)) {
611 611
        if (i == stream_index) {
612 612
            pts = ogg_calc_pts(s, i, NULL);
613 613
            if (os->keyframe_seek && !(os->pflags & AV_PKT_FLAG_KEY))

Also available in: Unified diff