[Mplayer-cvslog] CVS: main/libvo vo_directx.c,1.21,1.22

Sascha Sommer CVS faust3 at mplayerhq.hu
Thu Oct 9 19:28:57 CEST 2003


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

Modified Files:
	vo_directx.c 
Log Message:
yet another hack to prevent crashes with dr

Index: vo_directx.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_directx.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- vo_directx.c	4 Oct 2003 17:29:04 -0000	1.21
+++ vo_directx.c	9 Oct 2003 17:28:16 -0000	1.22
@@ -59,6 +59,7 @@
 extern void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride));
 extern int vo_doublebuffering;                      //tribblebuffering    
 extern int vo_fs;
+extern int vo_directrendering;
 
 /*****************************************************************************
  * DirectDraw GUIDs.
@@ -936,6 +937,10 @@
         g_lpddsPrimary->lpVtbl->Blt(g_lpddsPrimary, &rd, g_lpddsBack, NULL, DDBLT_WAIT, &ddbltfx);
     }	
 	g_lpddsBack->lpVtbl->Lock(g_lpddsBack,NULL,&ddsdsf, DDLOCK_NOSYSLOCK | DDLOCK_WAIT , NULL);
+    if(vo_directrendering && (dstride != ddsdsf.lPitch)){
+      mp_msg(MSGT_VO,MSGL_WARN,"<vo_directx><WARN>stride changed !!!! disabling direct rendering\n");
+      vo_directrendering=0;
+    }
 	dstride = ddsdsf.lPitch;
     image = ddsdsf.lpSurface;
 }



More information about the MPlayer-cvslog mailing list