Revision a2704c97 libavformat/tta.c

View differences:

libavformat/tta.c
46 46
    if (!av_metadata_get(s->metadata, "", NULL, AV_METADATA_IGNORE_SUFFIX))
47 47
        ff_id3v1_read(s);
48 48

  
49
    start_offset = url_ftell(s->pb);
49
    start_offset = avio_tell(s->pb);
50 50
    if (avio_rl32(s->pb) != AV_RL32("TTA1"))
51 51
        return -1; // not tta file
52 52

  
......
84 84
    st->start_time = 0;
85 85
    st->duration = datalen;
86 86

  
87
    framepos = url_ftell(s->pb) + 4*c->totalframes + 4;
87
    framepos = avio_tell(s->pb) + 4*c->totalframes + 4;
88 88

  
89 89
    for (i = 0; i < c->totalframes; i++) {
90 90
        uint32_t size = avio_rl32(s->pb);
......
99 99
    st->codec->sample_rate = samplerate;
100 100
    st->codec->bits_per_coded_sample = bps;
101 101

  
102
    st->codec->extradata_size = url_ftell(s->pb) - start_offset;
102
    st->codec->extradata_size = avio_tell(s->pb) - start_offset;
103 103
    if(st->codec->extradata_size+FF_INPUT_BUFFER_PADDING_SIZE <= (unsigned)st->codec->extradata_size){
104 104
        //this check is redundant as avio_read should fail
105 105
        av_log(s, AV_LOG_ERROR, "extradata_size too large\n");

Also available in: Unified diff