← Back to branch summary

~ubuntu-dev/mplayer/ubuntu-feisty

« back to all changes in this revision

Viewing changes to libavcodec/asv1.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/asv1.c
44
44
    int mb_height;
45
45
    int mb_width2;
46
46
    int mb_height2;
47
 
    DCTELEM __align8 block[6][64];
48
 
    uint16_t __align8 intra_matrix[64];
49
 
    int __align8 q_intra_matrix[64];
 
47
    DECLARE_ALIGNED_8(DCTELEM, block[6][64]);
 
48
    DECLARE_ALIGNED_8(uint16_t, intra_matrix[64]);
 
49
    DECLARE_ALIGNED_8(int, q_intra_matrix[64]);
50
50
    uint8_t *bitstream_buffer;
51
 
    int bitstream_buffer_size;
 
51
    unsigned int bitstream_buffer_size;
52
52
} ASV1Context;
53
53
 
54
54
static const uint8_t scantab[64]={
289
289
        if( (block[index + 1] = (block[index + 1]*a->q_intra_matrix[index + 1] + (1<<15))>>16) ) ccp |= 2;
290
290
        if( (block[index + 9] = (block[index + 9]*a->q_intra_matrix[index + 9] + (1<<15))>>16) ) ccp |= 1;
291
291
 
 
292
        assert(i || ccp<8);
292
293
        if(i) put_bits(&a->pb, ac_ccp_tab[ccp][1], ac_ccp_tab[ccp][0]);
293
294
        else  put_bits(&a->pb, dc_ccp_tab[ccp][1], dc_ccp_tab[ccp][0]);
294
295