Mercurial > libavcodec.hg
comparison mpegvideo.c @ 3286:30d412952107 libavcodec
clip_uint8 now return an uint8_t so no need to &0xFF
author | aurel |
---|---|
date | Mon, 01 May 2006 00:28:36 +0000 |
parents | 7fac25904a8b |
children | d185908c71cb |
comparison
equal
deleted
inserted
replaced
3285:d061e145af94 | 3286:30d412952107 |
---|---|
5575 /* for mjpeg, we do include qscale in the matrix */ | 5575 /* for mjpeg, we do include qscale in the matrix */ |
5576 s->intra_matrix[0] = ff_mpeg1_default_intra_matrix[0]; | 5576 s->intra_matrix[0] = ff_mpeg1_default_intra_matrix[0]; |
5577 for(i=1;i<64;i++){ | 5577 for(i=1;i<64;i++){ |
5578 int j= s->dsp.idct_permutation[i]; | 5578 int j= s->dsp.idct_permutation[i]; |
5579 | 5579 |
5580 s->intra_matrix[j] = clip_uint8((ff_mpeg1_default_intra_matrix[i] * s->qscale) >> 3) & 0xFF; | 5580 s->intra_matrix[j] = clip_uint8((ff_mpeg1_default_intra_matrix[i] * s->qscale) >> 3); |
5581 } | 5581 } |
5582 convert_matrix(&s->dsp, s->q_intra_matrix, s->q_intra_matrix16, | 5582 convert_matrix(&s->dsp, s->q_intra_matrix, s->q_intra_matrix16, |
5583 s->intra_matrix, s->intra_quant_bias, 8, 8, 1); | 5583 s->intra_matrix, s->intra_quant_bias, 8, 8, 1); |
5584 s->qscale= 8; | 5584 s->qscale= 8; |
5585 } | 5585 } |