← Back to branch summary

~ubuntu-dev/mplayer/ubuntu-feisty

« back to all changes in this revision

Viewing changes to libavcodec/4xm.c

  • Committer: Reinhard Tartler
  • Date: 2006-07-08 08:47:54 UTC
  • Revision ID: siretart@tauware.de-20060708084754-c3ff228cc9c2d8de
upgrade to pre8

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/4xm.c
121
121
    int mv[256];
122
122
    VLC pre_vlc;
123
123
    int last_dc;
124
 
    DCTELEM __align8 block[6][64];
 
124
    DECLARE_ALIGNED_8(DCTELEM, block[6][64]);
125
125
    uint8_t *bitstream_buffer;
126
 
    int bitstream_buffer_size;
 
126
    unsigned int bitstream_buffer_size;
127
127
    CFrameBuffer cfrm[CFRAME_BUFFER_COUNT];
128
128
} FourXContext;
129
129
 
606
606
    int i, frame_4cc, frame_size;
607
607
 
608
608
    frame_4cc= get32(buf);
609
 
    if(buf_size != get32(buf+4)+8){
 
609
    if(buf_size != get32(buf+4)+8 || buf_size < 20){
610
610
        av_log(f->avctx, AV_LOG_ERROR, "size mismatch %d %d\n", buf_size, get32(buf+4));
611
611
    }
612
612
 
634
634
        cfrm= &f->cfrm[i];
635
635
 
636
636
        cfrm->data= av_fast_realloc(cfrm->data, &cfrm->allocated_size, cfrm->size + data_size + FF_INPUT_BUFFER_PADDING_SIZE);
 
637
        if(!cfrm->data){ //explicit check needed as memcpy below might not catch a NULL
 
638
            av_log(f->avctx, AV_LOG_ERROR, "realloc falure");
 
639
            return -1;
 
640
        }
637
641
 
638
642
        memcpy(cfrm->data + cfrm->size, buf+20, data_size);
639
643
        cfrm->size += data_size;