diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/video_out/video_out_directx.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/video_out/video_out_directx.c b/src/video_out/video_out_directx.c index e9e3d9dd1..524d29a21 100755 --- a/src/video_out/video_out_directx.c +++ b/src/video_out/video_out_directx.c @@ -20,7 +20,7 @@ * video_out_directx.c, direct draw video output plugin for xine * by Matthew Grooms <elon@altavista.com> * - * $Id: video_out_directx.c,v 1.20 2004/11/24 16:11:04 mroi Exp $ + * $Id: video_out_directx.c,v 1.21 2004/12/01 07:23:55 athp Exp $ */ typedef unsigned char boolean; @@ -401,7 +401,7 @@ void Destroy( win32_driver_t * win32_driver ) 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_display_frame( vo_driver_t * vo_driver, vo_frame_t * vo_frame 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 @@ static void win32_overlay_blend( vo_driver_t * vo_driver, vo_frame_t * vo_frame, 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 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *wi 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; |