diff options
author | rik <rik@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-05-01 08:33:35 +0000 |
---|---|---|
committer | rik <rik@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-05-01 08:33:35 +0000 |
commit | fcb57df5133cb2844b29f4888d41fdb7883d83a3 (patch) | |
tree | beec505f9e0feb45fbea3d4d1c2e2a84949adc72 | |
parent | 64c03e2f895809fd7edde97ab5ef8a3829387f10 (diff) |
compilation fix (libavcodec sync)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15311 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | libmpcodecs/vf_zrmjpeg.c | 2 | ||||
-rw-r--r-- | libvo/jpeg_enc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libmpcodecs/vf_zrmjpeg.c b/libmpcodecs/vf_zrmjpeg.c index 0cd12370e4..d40c1c5c97 100644 --- a/libmpcodecs/vf_zrmjpeg.c +++ b/libmpcodecs/vf_zrmjpeg.c @@ -375,7 +375,7 @@ static jpeg_enc_t *jpeg_enc_init(int w, int h, int y_psize, int y_rsize, j->s->intra_matrix[0] = ff_mpeg1_default_intra_matrix[0]; for (i = 1; i < 64; i++) - j->s->intra_matrix[i] = CLAMP_TO_8BIT( + j->s->intra_matrix[i] = clip_uint8( (ff_mpeg1_default_intra_matrix[i]*j->s->qscale) >> 3); convert_matrix(j->s, j->s->q_intra_matrix, j->s->q_intra_matrix16, j->s->intra_matrix, j->s->intra_quant_bias, 8, 8); diff --git a/libvo/jpeg_enc.c b/libvo/jpeg_enc.c index 75764bba3d..060e097fd1 100644 --- a/libvo/jpeg_enc.c +++ b/libvo/jpeg_enc.c @@ -367,7 +367,7 @@ jpeg_enc_t *jpeg_enc_init(int w, int h, int y_psize, int y_rsize, j->s->intra_matrix[0] = ff_mpeg1_default_intra_matrix[0]; for (i = 1; i < 64; i++) - j->s->intra_matrix[i] = CLAMP_TO_8BIT( + j->s->intra_matrix[i] = clip_uint8( (ff_mpeg1_default_intra_matrix[i]*j->s->qscale) >> 3); convert_matrix(j->s, j->s->q_intra_matrix, j->s->q_intra_matrix16, j->s->intra_matrix, j->s->intra_quant_bias, 8, 8); |