[xine-cvs] CVS: xine-lib/src/video_out video_out_directx.c,1.20,1.21

[Andre P. <at...@us...>]

Update of /cvsroot/xine/xine-lib/src/video_out
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7655

Modified Files:
	video_out_directx.c 
Log Message:
Fix DirectX video output driver compilation on win32



Index: video_out_directx.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/video_out/video_out_directx.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- video_out_directx.c	24 Nov 2004 16:11:04 -0000	1.20
+++ video_out_directx.c	1 Dec 2004 07:23:55 -0000	1.21
@@ -401,7 +401,7 @@
   if( win32_driver->ddobj )
     IDirectDraw_Release( win32_driver->ddobj );
 
-  _x_alphablend_free(&this->alphablend_extra_data);
+  _x_alphablend_free(&win32_driver->alphablend_extra_data);
   
   free( win32_driver );
 }
@@ -1096,6 +1096,7 @@
 static void win32_overlay_blend( vo_driver_t * vo_driver, vo_frame_t * vo_frame, vo_overlay_t * vo_overlay )
 {
   win32_frame_t * win32_frame = ( win32_frame_t * ) vo_frame;
+  win32_driver_t * win32_driver = ( win32_driver_t * ) vo_driver;
 
   /* temporary overlay support, somthing more appropriate
    * for win32 will be devised at a later date */
@@ -1103,9 +1104,9 @@
   if( vo_overlay->rle )
     {
       if( vo_frame->format == XINE_IMGFMT_YV12 )
-	blend_yuv( win32_frame->vo_frame.base, vo_overlay, win32_frame->width, win32_frame->height, win32_frame->vo_frame.pitches, &this->alphablend_extra_data );
+	blend_yuv( win32_frame->vo_frame.base, vo_overlay, win32_frame->width, win32_frame->height, win32_frame->vo_frame.pitches, &win32_driver->alphablend_extra_data );
       else
-	blend_yuy2( win32_frame->vo_frame.base[0], vo_overlay, win32_frame->width, win32_frame->height, win32_frame->vo_frame.pitches[0], &this->alphablend_extra_data );
+	blend_yuy2( win32_frame->vo_frame.base[0], vo_overlay, win32_frame->width, win32_frame->height, win32_frame->vo_frame.pitches[0], &win32_driver->alphablend_extra_data );
     }
 }
 
@@ -1175,7 +1176,7 @@
   directx_class_t *class = (directx_class_t *)class_gen;
   win32_driver_t  *win32_driver = ( win32_driver_t * ) xine_xmalloc ( sizeof( win32_driver_t ) );
 
-  _x_alphablend_init(&this->alphablend_extra_data, class->xine);
+  _x_alphablend_init(&win32_driver->alphablend_extra_data, class->xine);
   
   win32_driver->xine = class->xine;