Revision f59d8ff8 libavformat/utils.c

View differences:

libavformat/utils.c
1531 1531
        return -1;
1532 1532

  
1533 1533
    /* do the seek */
1534
    if ((ret = url_fseek(s->pb, pos, SEEK_SET)) < 0)
1534
    if ((ret = avio_seek(s->pb, pos, SEEK_SET)) < 0)
1535 1535
        return ret;
1536 1536

  
1537 1537
    av_update_cur_dts(s, st, ts);
......
1671 1671
    if     (pos < pos_min) pos= pos_min;
1672 1672
    else if(pos > pos_max) pos= pos_max;
1673 1673

  
1674
    url_fseek(s->pb, pos, SEEK_SET);
1674
    avio_seek(s->pb, pos, SEEK_SET);
1675 1675

  
1676 1676
#if 0
1677 1677
    av_update_cur_dts(s, st, ts);
......
1701 1701
        if(st->nb_index_entries){
1702 1702
            assert(st->index_entries);
1703 1703
            ie= &st->index_entries[st->nb_index_entries-1];
1704
            if ((ret = url_fseek(s->pb, ie->pos, SEEK_SET)) < 0)
1704
            if ((ret = avio_seek(s->pb, ie->pos, SEEK_SET)) < 0)
1705 1705
                return ret;
1706 1706
            av_update_cur_dts(s, st, ie->timestamp);
1707 1707
        }else{
1708
            if ((ret = url_fseek(s->pb, s->data_offset, SEEK_SET)) < 0)
1708
            if ((ret = avio_seek(s->pb, s->data_offset, SEEK_SET)) < 0)
1709 1709
                return ret;
1710 1710
        }
1711 1711
        for(i=0;; i++) {
......
1732 1732
            return 0;
1733 1733
    }
1734 1734
    ie = &st->index_entries[index];
1735
    if ((ret = url_fseek(s->pb, ie->pos, SEEK_SET)) < 0)
1735
    if ((ret = avio_seek(s->pb, ie->pos, SEEK_SET)) < 0)
1736 1736
        return ret;
1737 1737
    av_update_cur_dts(s, st, ie->timestamp);
1738 1738

  
......
1956 1956
    if (offset < 0)
1957 1957
        offset = 0;
1958 1958

  
1959
    url_fseek(ic->pb, offset, SEEK_SET);
1959
    avio_seek(ic->pb, offset, SEEK_SET);
1960 1960
    read_size = 0;
1961 1961
    for(;;) {
1962 1962
        if (read_size >= DURATION_MAX_READ_SIZE<<(FFMAX(retry-1,0)))
......
1991 1991

  
1992 1992
    fill_all_stream_timings(ic);
1993 1993

  
1994
    url_fseek(ic->pb, old_offset, SEEK_SET);
1994
    avio_seek(ic->pb, old_offset, SEEK_SET);
1995 1995
    for (i=0; i<ic->nb_streams; i++) {
1996 1996
        st= ic->streams[i];
1997 1997
        st->cur_dts= st->first_dts;

Also available in: Unified diff