From cc85714c6f93d3594e829bacea1c974f37d10ca0 Mon Sep 17 00:00:00 2001 From: rik Date: Fri, 31 Oct 2003 22:22:46 +0000 Subject: function convert_matrix() is fixed (off-by-one error) and it is now called with the optimal arguments so that it doesn't do unneeded work, the change was inspired by a comment from Alex git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11346 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/jpeg_enc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libvo/jpeg_enc.c b/libvo/jpeg_enc.c index 272d426611..7733b39e4b 100644 --- a/libvo/jpeg_enc.c +++ b/libvo/jpeg_enc.c @@ -79,7 +79,7 @@ static void convert_matrix(MpegEncContext *s, int (*qmat)[64], { int qscale; - for(qscale=qmin; qscaledsp.fdct == ff_jpeg_fdct_islow) { for (i = 0; i < 64; i++) { @@ -367,7 +367,7 @@ jpeg_enc_t *jpeg_enc_init(int w, int h, int y_psize, int y_rsize, j->s->intra_matrix[i] = CLAMP_TO_8BIT( (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, 1, 31); + j->s->intra_matrix, j->s->intra_quant_bias, 8, 8); return j; } -- cgit v1.2.3