Mercurial > mplayer.hg
changeset 15310:b01679500a5e
compilation fix (libavcodec sync)
| author | rik |
|---|---|
| date | Sun, 01 May 2005 08:33:35 +0000 |
| parents | cfbd8e4b3ede |
| children | b00b16a1ef05 |
| files | libmpcodecs/vf_zrmjpeg.c libvo/jpeg_enc.c |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpcodecs/vf_zrmjpeg.c Sun May 01 05:11:02 2005 +0000 +++ b/libmpcodecs/vf_zrmjpeg.c Sun May 01 08:33:35 2005 +0000 @@ -375,7 +375,7 @@ 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);
--- a/libvo/jpeg_enc.c Sun May 01 05:11:02 2005 +0000 +++ b/libvo/jpeg_enc.c Sun May 01 08:33:35 2005 +0000 @@ -367,7 +367,7 @@ 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);