Revision e63a3628 libavformat/amr.c

View differences:

libavformat/amr.c
82 82
    AVStream *st;
83 83
    uint8_t header[9];
84 84

  
85
    get_buffer(pb, header, 6);
85
    avio_read(pb, header, 6);
86 86

  
87 87
    st = av_new_stream(s, 0);
88 88
    if (!st)
......
91 91
    }
92 92
    if(memcmp(header,AMR_header,6)!=0)
93 93
    {
94
        get_buffer(pb, header+6, 3);
94
        avio_read(pb, header+6, 3);
95 95
        if(memcmp(header,AMRWB_header,9)!=0)
96 96
        {
97 97
            return -1;
......
128 128
    }
129 129

  
130 130
//FIXME this is wrong, this should rather be in a AVParset
131
    toc=get_byte(s->pb);
131
    toc=avio_r8(s->pb);
132 132
    mode = (toc >> 3) & 0x0F;
133 133

  
134 134
    if (enc->codec_id == CODEC_ID_AMR_NB)
......
157 157
    pkt->pos= url_ftell(s->pb);
158 158
    pkt->data[0]=toc;
159 159
    pkt->duration= enc->codec_id == CODEC_ID_AMR_NB ? 160 : 320;
160
    read = get_buffer(s->pb, pkt->data+1, size-1);
160
    read = avio_read(s->pb, pkt->data+1, size-1);
161 161

  
162 162
    if (read != size-1)
163 163
    {

Also available in: Unified diff