diff options
| author | František Dvořák <valtri@users.sourceforge.net> | 2005-08-29 15:28:16 +0000 |
|---|---|---|
| committer | František Dvořák <valtri@users.sourceforge.net> | 2005-08-29 15:28:16 +0000 |
| commit | 0f8fd3b22893dd07db6506a1ba4d298e51a1c985 (patch) | |
| tree | 291cf3594687cdaaa23f9527ba6d9f20f1a6283d /src/video_out | |
| parent | 7cb89d83b0d845270e583c2848b0eaaa5e053217 (diff) | |
| download | xine-lib-0f8fd3b22893dd07db6506a1ba4d298e51a1c985.tar.gz xine-lib-0f8fd3b22893dd07db6506a1ba4d298e51a1c985.tar.bz2 | |
*BUGFIX*
Windows ports updates:
- finished M$VC port update
- moved xine plugins back to normal location for Windows ports,
added relative directories (used relative to ${prefix}),
make sure it's thread-safe (but it's still hacky)
- fixed ugly bug with loading plugins, when working drive was differrent from
plugins directory
directory
- directory and subdirectory separator called as platform specific
- fix crash with newer win32 pthread (missing mutex_init in vo plugin), yes!
- small doc update
CVS patchset: 7712
CVS date: 2005/08/29 15:28:16
Diffstat (limited to 'src/video_out')
| -rw-r--r-- | src/video_out/Makefile.am | 2 | ||||
| -rwxr-xr-x | src/video_out/video_out_directx.c | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am index 5b07ad1b3..4246068c0 100644 --- a/src/video_out/Makefile.am +++ b/src/video_out/Makefile.am @@ -162,7 +162,7 @@ xineplug_vo_out_stk_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ xineplug_vo_out_directx_la_SOURCES = alphablend.c yuv2rgb.c yuv2rgb_mmx.c video_out_directx.c xineplug_vo_out_directx_la_CPPFLAGS = $(DIRECTX_CPPFLAGS) -xineplug_vo_out_directx_la_LIBADD = $(DIRECTX_VIDEO_LIBS) $(XINE_LIB) +xineplug_vo_out_directx_la_LIBADD = $(DIRECTX_VIDEO_LIBS) $(XINE_LIB) $(THREAD_LIBS) xineplug_vo_out_directx_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ xineplug_vo_out_none_la_SOURCES = video_out_none.c diff --git a/src/video_out/video_out_directx.c b/src/video_out/video_out_directx.c index 5827ad27c..946e3f3e4 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.22 2005/08/25 15:36:30 valtri Exp $ + * $Id: video_out_directx.c,v 1.23 2005/08/29 15:28:16 valtri Exp $ */ typedef unsigned char boolean; @@ -28,6 +28,8 @@ typedef unsigned char boolean; #include <windows.h> #include <ddraw.h> +#include <pthread.h> + #include "xine.h" #include "video_out.h" #include "alphablend.h" @@ -866,6 +868,8 @@ static vo_frame_t * win32_alloc_frame( vo_driver_t * vo_driver ) if (!win32_frame) return NULL; + pthread_mutex_init(&win32_frame->vo_frame.mutex, NULL); + win32_frame->vo_frame.proc_slice = NULL; win32_frame->vo_frame.proc_frame = NULL; win32_frame->vo_frame.field = win32_frame_field; |