Revision 384c9c2f libavformat/ipmovie.c

View differences:

libavformat/ipmovie.c
405 405
            debug_ipmovie("audio frame\n");
406 406

  
407 407
            /* log position and move on for now */
408
            s->audio_chunk_offset = url_ftell(pb);
408
            s->audio_chunk_offset = avio_tell(pb);
409 409
            s->audio_chunk_size = opcode_size;
410 410
            avio_seek(pb, opcode_size, SEEK_CUR);
411 411
            break;
......
471 471
            debug_ipmovie("set decoding map\n");
472 472

  
473 473
            /* log position and move on for now */
474
            s->decode_map_chunk_offset = url_ftell(pb);
474
            s->decode_map_chunk_offset = avio_tell(pb);
475 475
            s->decode_map_chunk_size = opcode_size;
476 476
            avio_seek(pb, opcode_size, SEEK_CUR);
477 477
            break;
......
480 480
            debug_ipmovie("set video data\n");
481 481

  
482 482
            /* log position and move on for now */
483
            s->video_chunk_offset = url_ftell(pb);
483
            s->video_chunk_offset = avio_tell(pb);
484 484
            s->video_chunk_size = opcode_size;
485 485
            avio_seek(pb, opcode_size, SEEK_CUR);
486 486
            break;
......
494 494
    }
495 495

  
496 496
    /* make a note of where the stream is sitting */
497
    s->next_chunk_offset = url_ftell(pb);
497
    s->next_chunk_offset = avio_tell(pb);
498 498

  
499 499
    /* dispatch the first of any pending packets */
500 500
    if ((chunk_type == CHUNK_VIDEO) || (chunk_type == CHUNK_AUDIO_ONLY))
......
541 541
    ipmovie->decode_map_chunk_offset = 0;
542 542

  
543 543
    /* on the first read, this will position the stream at the first chunk */
544
    ipmovie->next_chunk_offset = url_ftell(pb) + 4;
544
    ipmovie->next_chunk_offset = avio_tell(pb) + 4;
545 545

  
546 546
    /* process the first chunk which should be CHUNK_INIT_VIDEO */
547 547
    if (process_ipmovie_chunk(ipmovie, pb, &pkt) != CHUNK_INIT_VIDEO)

Also available in: Unified diff