summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authorrik <rik@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-07-11 13:05:53 +0000
committerrik <rik@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-07-11 13:05:53 +0000
commitd168d0e5458986bbe0fcd4be13bdcd40fa5db196 (patch)
tree7673c93cfa07cb1931960d3f799e2bee84731503 /libvo
parent51b5404658d1b88b8464778e08f8f2ac81ec1521 (diff)
downloadmpv-d168d0e5458986bbe0fcd4be13bdcd40fa5db196.tar.bz2
mpv-d168d0e5458986bbe0fcd4be13bdcd40fa5db196.tar.xz
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
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 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);