Mercurial > libavcodec.hg
diff mpegvideo.c @ 533:3c07cf9595de libavcodec
adding ff prefix to avoid global name conficts with xvid (patch by Marko Kreen <marko at l-t.ee>)
author | michaelni |
---|---|
date | Wed, 10 Jul 2002 21:01:45 +0000 |
parents | c9f724e3a797 |
children | 218eb765c987 |
line wrap: on
line diff
--- a/mpegvideo.c Wed Jul 10 20:21:00 2002 +0000 +++ b/mpegvideo.c Wed Jul 10 21:01:45 2002 +0000 @@ -520,11 +520,11 @@ /* init default q matrix */ for(i=0;i<64;i++) { if(s->out_format == FMT_H263) - s->intra_matrix[i] = default_non_intra_matrix[i]; + s->intra_matrix[i] = ff_mpeg1_default_non_intra_matrix[i]; else - s->intra_matrix[i] = default_intra_matrix[i]; + s->intra_matrix[i] = ff_mpeg1_default_intra_matrix[i]; - s->inter_matrix[i] = default_non_intra_matrix[i]; + s->inter_matrix[i] = ff_mpeg1_default_non_intra_matrix[i]; } /* precompute matrix */ @@ -1796,9 +1796,9 @@ if (s->out_format == FMT_MJPEG) { /* for mjpeg, we do include qscale in the matrix */ - s->intra_matrix[0] = default_intra_matrix[0]; + s->intra_matrix[0] = ff_mpeg1_default_intra_matrix[0]; for(i=1;i<64;i++) - s->intra_matrix[i] = CLAMP_TO_8BIT((default_intra_matrix[i] * s->qscale) >> 3); + s->intra_matrix[i] = CLAMP_TO_8BIT((ff_mpeg1_default_intra_matrix[i] * s->qscale) >> 3); convert_matrix(s->q_intra_matrix, s->q_intra_matrix16, s->q_intra_matrix16_bias, s->intra_matrix, s->intra_quant_bias); }