Revision b7effd4e libavformat/oggdec.c

View differences:

libavformat/oggdec.c
207 207
    uint8_t sync[4];
208 208
    int sp = 0;
209 209

  
210
    if (get_buffer (bc, sync, 4) < 4)
210
    if (avio_read (bc, sync, 4) < 4)
211 211
        return -1;
212 212

  
213 213
    do{
......
233 233
        return -1;
234 234

  
235 235
    flags = url_fgetc (bc);
236
    gp = get_le64 (bc);
237
    serial = get_le32 (bc);
238
    seq = get_le32 (bc);
239
    crc = get_le32 (bc);
236
    gp = avio_rl64 (bc);
237
    serial = avio_rl32 (bc);
238
    seq = avio_rl32 (bc);
239
    crc = avio_rl32 (bc);
240 240
    nsegs = url_fgetc (bc);
241 241

  
242 242
    idx = ogg_find_stream (ogg, serial);
......
252 252
    if(os->psize > 0)
253 253
        ogg_new_buf(ogg, idx);
254 254

  
255
    if (get_buffer (bc, os->segments, nsegs) < nsegs)
255
    if (avio_read (bc, os->segments, nsegs) < nsegs)
256 256
        return -1;
257 257

  
258 258
    os->nsegs = nsegs;
......
284 284
        os->buf = nb;
285 285
    }
286 286

  
287
    if (get_buffer (bc, os->buf + os->bufpos, size) < size)
287
    if (avio_read (bc, os->buf + os->bufpos, size) < size)
288 288
        return -1;
289 289

  
290 290
    os->bufpos += size;

Also available in: Unified diff