[Mplayer-cvslog] CVS: main/libmpcodecs vd_ffmpeg.c,1.65,1.66 mp_image.h,1.20,1.21

[Michael Niedermayer]

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

Modified Files:
	vd_ffmpeg.c mp_image.h 
Log Message:
change qscale type to int8 and fix qscale ordering


Index: vd_ffmpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_ffmpeg.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- vd_ffmpeg.c	29 Oct 2002 11:26:26 -0000	1.65
+++ vd_ffmpeg.c	30 Oct 2002 20:50:10 -0000	1.66
@@ -619,16 +619,9 @@
     }
     
 /* to comfirm with newer lavc style */
-#if !defined(FF_POSTPROCESS) && (LIBAVCODEC_BUILD > 4612)
-    mpi->qscale=avctx->quant_store;
-#if LIBAVCODEC_BUILD > 4613
+#if LIBAVCODEC_BUILD >= 4633
+    mpi->qscale=avctx->display_qscale_table;
     mpi->qstride=avctx->qstride;
-#else
-    mpi->qstride=MBC+1;
-#endif
-#elif defined(FF_POSTPROCESS)
-    mpi->qscale=&quant_store[0][0];
-    mpi->qstride=MBC+1;
 #endif
 
     {

Index: mp_image.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/mp_image.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mp_image.h	29 Oct 2002 11:26:26 -0000	1.20
+++ mp_image.h	30 Oct 2002 20:50:10 -0000	1.21
@@ -73,7 +73,7 @@
     int x,y,w,h;  // visible dimensions
     unsigned char* planes[MP_MAX_PLANES];
     unsigned int stride[MP_MAX_PLANES];
-    int* qscale;
+    char * qscale;
     int qstride;
     int pict_type; // 0->unknown, 1->I, 2->P, 3->B
     int num_planes;