[Mplayer-cvslog] CVS: main/libvo jpeg_enc.c,1.6,1.7

[Rik Snel CVS]

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var/tmp.root/cvs-serv7777

Modified Files:
	jpeg_enc.c 
Log Message:
adapting to the 'adding fff prefix to avoid global name conflicts' changes in libavcodec

Index: jpeg_enc.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/jpeg_enc.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jpeg_enc.c	7 Jun 2002 18:55:47 -0000	1.6
+++ jpeg_enc.c	11 Jul 2002 13:05:53 -0000	1.7
@@ -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);