Revision b7effd4e libavformat/sierravmd.c

View differences:

libavformat/sierravmd.c
96 96

  
97 97
    /* fetch the main header, including the 2 header length bytes */
98 98
    url_fseek(pb, 0, SEEK_SET);
99
    if (get_buffer(pb, vmd->vmd_header, VMD_HEADER_SIZE) != VMD_HEADER_SIZE)
99
    if (avio_read(pb, vmd->vmd_header, VMD_HEADER_SIZE) != VMD_HEADER_SIZE)
100 100
        return AVERROR(EIO);
101 101

  
102 102
    if(vmd->vmd_header[16] == 'i' && vmd->vmd_header[17] == 'v' && vmd->vmd_header[18] == '3')
......
172 172
        av_free(vmd->frame_table);
173 173
        return AVERROR(ENOMEM);
174 174
    }
175
    if (get_buffer(pb, raw_frame_table, raw_frame_table_size) !=
175
    if (avio_read(pb, raw_frame_table, raw_frame_table_size) !=
176 176
        raw_frame_table_size) {
177 177
        av_free(raw_frame_table);
178 178
        av_free(vmd->frame_table);
......
189 189
            int type;
190 190
            uint32_t size;
191 191

  
192
            get_buffer(pb, chunk, BYTES_PER_FRAME_RECORD);
192
            avio_read(pb, chunk, BYTES_PER_FRAME_RECORD);
193 193
            type = chunk[0];
194 194
            size = AV_RL32(&chunk[2]);
195 195
            if(!size && type != 1)
......
250 250
    pkt->pos= url_ftell(pb);
251 251
    memcpy(pkt->data, frame->frame_record, BYTES_PER_FRAME_RECORD);
252 252
    if(vmd->is_indeo3)
253
        ret = get_buffer(pb, pkt->data, frame->frame_size);
253
        ret = avio_read(pb, pkt->data, frame->frame_size);
254 254
    else
255
        ret = get_buffer(pb, pkt->data + BYTES_PER_FRAME_RECORD,
255
        ret = avio_read(pb, pkt->data + BYTES_PER_FRAME_RECORD,
256 256
            frame->frame_size);
257 257

  
258 258
    if (ret != frame->frame_size) {

Also available in: Unified diff