summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authorrik <rik@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-10-31 22:22:46 +0000
committerrik <rik@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-10-31 22:22:46 +0000
commitcc85714c6f93d3594e829bacea1c974f37d10ca0 (patch)
treef1169cc1c85216c119270efb99e61b295d84646b /libvo
parent359b5d8f5e8a378423cf5462bf1da71e08a5e853 (diff)
downloadmpv-cc85714c6f93d3594e829bacea1c974f37d10ca0.tar.bz2
mpv-cc85714c6f93d3594e829bacea1c974f37d10ca0.tar.xz
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
Diffstat (limited to 'libvo')
-rw-r--r--libvo/jpeg_enc.c4
1 files 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; qscale<qmax; qscale++){
+ for(qscale=qmin; qscale<=qmax; qscale++){
int i;
if (s->dsp.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;
}