Revision a2704c97 libavformat/asfenc.c

View differences:

libavformat/asfenc.c
248 248
{
249 249
    int64_t pos;
250 250

  
251
    pos = url_ftell(pb);
251
    pos = avio_tell(pb);
252 252
    put_guid(pb, g);
253 253
    avio_wl64(pb, 24);
254 254
    return pos;
......
259 259
{
260 260
    int64_t pos1;
261 261

  
262
    pos1 = url_ftell(pb);
262
    pos1 = avio_tell(pb);
263 263
    avio_seek(pb, pos + 16, SEEK_SET);
264 264
    avio_wl64(pb, pos1 - pos);
265 265
    avio_seek(pb, pos1, SEEK_SET);
......
337 337
    avio_w8(pb, 2); /* ??? */
338 338

  
339 339
    /* file header */
340
    header_offset = url_ftell(pb);
340
    header_offset = avio_tell(pb);
341 341
    hpos = put_header(pb, &ff_asf_file_header);
342 342
    put_guid(pb, &ff_asf_my_guid);
343 343
    avio_wl64(pb, file_size);
......
425 425
            put_guid(pb, &ff_asf_video_conceal_none);
426 426
        }
427 427
        avio_wl64(pb, 0); /* ??? */
428
        es_pos = url_ftell(pb);
428
        es_pos = avio_tell(pb);
429 429
        avio_wl32(pb, extra_size); /* wav header len */
430 430
        avio_wl32(pb, extra_size2); /* additional data len */
431 431
        avio_wl16(pb, n + 1); /* stream number */
......
442 442
            if (wavsize < 0)
443 443
                return -1;
444 444
            if (wavsize != extra_size) {
445
                cur_pos = url_ftell(pb);
445
                cur_pos = avio_tell(pb);
446 446
                avio_seek(pb, es_pos, SEEK_SET);
447 447
                avio_wl32(pb, wavsize); /* wav header len */
448 448
                avio_seek(pb, cur_pos, SEEK_SET);
......
525 525

  
526 526
    /* patch the header size fields */
527 527

  
528
    cur_pos = url_ftell(pb);
528
    cur_pos = avio_tell(pb);
529 529
    header_size = cur_pos - header_offset;
530 530
    if (asf->is_streamed) {
531 531
        header_size += 8 + 30 + 50;
......
605 605
    ASFContext *asf = s->priv_data;
606 606
    AVIOContext *pb = s->pb;
607 607
    int ppi_size, i;
608
    int64_t start= url_ftell(pb);
608
    int64_t start= avio_tell(pb);
609 609

  
610 610
    int iLengthTypeFlags = ASF_PPI_LENGTH_TYPE_FLAGS;
611 611

  
......
642 642
    if (asf->multi_payloads_present)
643 643
        avio_w8(pb, nb_payloads | ASF_PAYLOAD_FLAGS);
644 644

  
645
    ppi_size = url_ftell(pb) - start;
645
    ppi_size = avio_tell(pb) - start;
646 646

  
647 647
    return ppi_size;
648 648
}
......
860 860
        flush_packet(s);
861 861

  
862 862
    /* write index */
863
    data_size = url_ftell(s->pb);
863
    data_size = avio_tell(s->pb);
864 864
    if ((!asf->is_streamed) && (asf->nb_index_count != 0)) {
865 865
        asf_write_index(s, asf->index_ptr, asf->maximum_packet, asf->nb_index_count);
866 866
    }
......
870 870
        put_chunk(s, 0x4524, 0, 0); /* end of stream */
871 871
    } else {
872 872
        /* rewrite an updated header */
873
        file_size = url_ftell(s->pb);
873
        file_size = avio_tell(s->pb);
874 874
        avio_seek(s->pb, 0, SEEK_SET);
875 875
        asf_write_header1(s, file_size, data_size - asf->data_offset);
876 876
    }

Also available in: Unified diff