[MPlayer-cvslog] r34734 - trunk/libvo/jpeg_enc.c

[reimar]

Author: reimar
Date: Sat Feb 18 17:22:37 2012
New Revision: 34734

Log:
Attempt to make --enable-zr compile again.

Modified:
   trunk/libvo/jpeg_enc.c

Modified: trunk/libvo/jpeg_enc.c
==============================================================================
--- trunk/libvo/jpeg_enc.c	Sat Feb 18 01:08:30 2012	(r34733)
+++ trunk/libvo/jpeg_enc.c	Sat Feb 18 17:22:37 2012	(r34734)
@@ -81,7 +81,7 @@ static void convert_matrix(MpegEncContex
 			qmat[qscale][i] = (int)((UINT64_C(1) << (QMAT_SHIFT-3))/
 					(qscale * quant_matrix[j]));
 		}
-	} else if (s->dsp.fdct == fdct_ifast) {
+	} else if (s->dsp.fdct == ff_fdct_ifast) {
             for(i=0;i<64;i++) {
                 const int j = s->dsp.idct_permutation[i];
                 /* 16 <= qscale * quant_matrix[i] <= 7905 */
@@ -304,7 +304,7 @@ jpeg_enc_t *jpeg_enc_init(int w, int h, 
 	j->s->out_format = FMT_MJPEG;
 	j->s->intra_only = 1;
 	j->s->encoding = 1;
-	j->s->pict_type = FF_I_TYPE;
+	j->s->pict_type = AV_PICTURE_TYPE_I;
 	j->s->y_dc_scale = 8;
 	j->s->c_dc_scale = 8;
 
@@ -335,7 +335,7 @@ jpeg_enc_t *jpeg_enc_init(int w, int h, 
 	/* make MPV_common_init allocate important buffers, like s->block */
 	j->s->avctx->thread_count = 1;
 
-	if (MPV_common_init(j->s) < 0) {
+	if (ff_MPV_common_init(j->s) < 0) {
 		av_free(j->s);
 		av_free(j);
 		return NULL;