# HG changeset patch # User rik # Date 1026392753 0 # Node ID feeaffcce1fa8a9de64eab1c5c18fb79b6a6d587 # Parent df3bf0f971d14518764f9d486da27434dee0cb2a adapting to the 'adding fff prefix to avoid global name conflicts' changes in libavcodec diff -r df3bf0f971d1 -r feeaffcce1fa libvo/jpeg_enc.c --- a/libvo/jpeg_enc.c Thu Jul 11 10:20:54 2002 +0000 +++ b/libvo/jpeg_enc.c Thu Jul 11 13:05:53 2002 +0000 @@ -348,10 +348,10 @@ 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);