[MPlayer-cvslog] CVS: main/libmpcodecs vd_realvid.c,1.29,1.30

[Roberto Togni CVS]

CVS change done by Roberto Togni CVS

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var2/tmp/cvs-serv5572/libmpcodecs

Modified Files:
	vd_realvid.c 
Log Message:
Play RV30 with 8-elements cmsg24
Fixes rv30_cmsg24_test.rmvb (now in samples)


Index: vd_realvid.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_realvid.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- vd_realvid.c	9 Jan 2005 17:38:12 -0000	1.29
+++ vd_realvid.c	22 Jan 2005 00:06:59 -0000	1.30
@@ -253,7 +253,10 @@
 	}
 	// setup rv30 codec (codec sub-type and image dimensions):
 	if((sh->format<=0x30335652) && (extrahdr[1]>=0x20200002)){
-	    uint32_t cmsg24[4]={sh->disp_w,sh->disp_h,((unsigned short *)extrahdr)[4],((unsigned short *)extrahdr)[5]};
+	    // We could read nonsense data while filling this, but input is big enough so no sig11
+	    uint32_t cmsg24[8]={sh->disp_w,sh->disp_h,((unsigned char *)extrahdr)[8]*4,((unsigned char *)extrahdr)[9]*4,
+	                        ((unsigned char *)extrahdr)[10]*4,((unsigned char *)extrahdr)[11]*4,
+	                        ((unsigned char *)extrahdr)[12]*4,((unsigned char *)extrahdr)[13]*4};
 	    cmsg_data_t cmsg_data={0x24,1+((extrahdr[0]>>16)&7), &cmsg24[0]};
 
 #ifdef USE_WIN32DLL