Revision b7effd4e libavformat/utils.c

View differences:

libavformat/utils.c
332 332

  
333 333
    pkt->pos= url_ftell(s);
334 334

  
335
    ret= get_buffer(s, pkt->data, size);
335
    ret= avio_read(s, pkt->data, size);
336 336
    if(ret<=0)
337 337
        av_free_packet(pkt);
338 338
    else
......
351 351
    ret = av_grow_packet(pkt, size);
352 352
    if (ret < 0)
353 353
        return ret;
354
    ret = get_buffer(s, pkt->data + old_size, size);
354
    ret = avio_read(s, pkt->data + old_size, size);
355 355
    av_shrink_packet(pkt, old_size + FFMAX(ret, 0));
356 356
    return ret;
357 357
}
......
555 555

  
556 556
        /* read probe data */
557 557
        buf = av_realloc(buf, probe_size + AVPROBE_PADDING_SIZE);
558
        if ((ret = get_buffer(pb, buf + buf_offset, probe_size - buf_offset)) < 0) {
558
        if ((ret = avio_read(pb, buf + buf_offset, probe_size - buf_offset)) < 0) {
559 559
            /* fail if error was not end of file, otherwise, lower score */
560 560
            if (ret != AVERROR_EOF) {
561 561
                av_free(buf);

Also available in: Unified diff