From d168d0e5458986bbe0fcd4be13bdcd40fa5db196 Mon Sep 17 00:00:00 2001 From: rik Date: Thu, 11 Jul 2002 13:05:53 +0000 Subject: [PATCH] adapting to the 'adding fff prefix to avoid global name conflicts' changes in libavcodec git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6704 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 69d89ee196..0fd89d8977 100644 --- a/libvo/jpeg_enc.c +++ b/libvo/jpeg_enc.c @@ -348,10 +348,10 @@ jpeg_enc_t *jpeg_enc_init(int w, int h, int y_psize, int y_rsize, j->s->mb_height = j->s->height/8; j->s->mb_intra = 1; - j->s->intra_matrix[0] = default_intra_matrix[0]; + j->s->intra_matrix[0] = ff_mpeg1_default_intra_matrix[0]; for (i = 1; i < 64; i++) j->s->intra_matrix[i] = - (default_intra_matrix[i]*j->s->qscale) >> 3; + (ff_mpeg1_default_intra_matrix[i]*j->s->qscale) >> 3; convert_matrix(j->s->q_intra_matrix, j->s->q_intra_matrix16, j->s->q_intra_matrix16_bias, j->s->intra_matrix, j->s->intra_quant_bias);