[Mplayer-cvslog] CVS: main/libmpcodecs vd_qtrpza.c,1.2,1.3 vd_cinepak.c,1.3,1.4

[Arpi of Ize]

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

Modified Files:
	vd_qtrpza.c vd_cinepak.c 
Log Message:
order of #includes changed - shouldn't include local things before config.h

Index: vd_qtrpza.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_qtrpza.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vd_qtrpza.c	6 Mar 2002 15:25:10 -0000	1.2
+++ vd_qtrpza.c	6 Mar 2002 20:56:06 -0000	1.3
@@ -1,11 +1,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "codec-cfg.h"
-
 #include "config.h"
 #include "mp_msg.h"
 
+#include "codec-cfg.h"
 #include "../libvo/img_format.h"
 
 #include "stream.h"

Index: vd_cinepak.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_cinepak.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vd_cinepak.c	6 Mar 2002 14:29:27 -0000	1.3
+++ vd_cinepak.c	6 Mar 2002 20:56:06 -0000	1.4
@@ -1,11 +1,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "codec-cfg.h"
-
 #include "config.h"
 #include "mp_msg.h"
 
+#include "codec-cfg.h"
 #include "../libvo/img_format.h"
 
 #include "stream.h"
@@ -55,12 +54,21 @@
     mp_image_t* mpi;
     if(len<=0) return NULL; // skipped frame
     
-    mpi=mpcodecs_get_image(sh, MP_IMGTYPE_STATIC, MP_IMGFLAG_PRESERVE | MP_IMGFLAG_ACCEPT_STRIDE, sh->disp_w, sh->disp_h);
+    mpi=mpcodecs_get_image(sh, MP_IMGTYPE_STATIC, MP_IMGFLAG_PRESERVE | MP_IMGFLAG_ACCEPT_STRIDE, 
+	(sh->disp_w+3)&(~3),
+	(sh->disp_h+3)&(~3));
     
     if(!mpi){	// temporary!
 	printf("couldn't allocate image for cinepak codec\n");
 	return NULL;
     }
+    
+    printf("mpi: %p/%d %p/%d %p/%d (%d) (%d)  \n",
+	mpi->planes[0], mpi->stride[0],
+	mpi->planes[1], mpi->stride[1],
+	mpi->planes[2], mpi->stride[2],
+	mpi->planes[1]-mpi->planes[0],
+	mpi->planes[2]-mpi->planes[1]);
     
 //    decode_cinepak(sh->context, data, len, mpi->planes[0], sh->disp_w, sh->disp_h,
 //	(mpi->flags&MP_IMGFLAG_YUV)?16:(mpi->imgfmt&255), mpi->stride[0]);