Revision a2704c97 libavformat/wv.c

View differences:

libavformat/wv.c
84 84
    int rate, bpp, chan;
85 85
    uint32_t chmask;
86 86

  
87
    wc->pos = url_ftell(pb);
87
    wc->pos = avio_tell(pb);
88 88
    if(!append){
89 89
        tag = avio_rl32(pb);
90 90
        if (tag != MKTAG('w', 'v', 'p', 'k'))
......
120 120
        chmask = wc->chmask;
121 121
    }
122 122
    if((rate == -1 || !chan) && !wc->block_parsed){
123
        int64_t block_end = url_ftell(pb) + wc->blksize - 24;
123
        int64_t block_end = avio_tell(pb) + wc->blksize - 24;
124 124
        if(url_is_streamed(pb)){
125 125
            av_log(ctx, AV_LOG_ERROR, "Cannot determine additional parameters\n");
126 126
            return -1;
127 127
        }
128
        while(url_ftell(pb) < block_end){
128
        while(avio_tell(pb) < block_end){
129 129
            int id, size;
130 130
            id = avio_r8(pb);
131 131
            size = (id & 0x80) ? avio_rl24(pb) : avio_r8(pb);
......
224 224
    st->duration = wc->samples;
225 225

  
226 226
    if(!url_is_streamed(s->pb)) {
227
        int64_t cur = url_ftell(s->pb);
227
        int64_t cur = avio_tell(s->pb);
228 228
        ff_ape_parse_tag(s);
229 229
        if(!av_metadata_get(s->metadata, "", NULL, AV_METADATA_IGNORE_SUFFIX))
230 230
            ff_id3v1_read(s);
......
327 327
    if(timestamp < 0 || timestamp >= s->duration)
328 328
        return -1;
329 329

  
330
    pos = url_ftell(s->pb);
330
    pos = avio_tell(s->pb);
331 331
    do{
332 332
        ret = av_read_frame(s, pkt);
333 333
        if (ret < 0){

Also available in: Unified diff