diff options
| author | Tim Champagne <tchamp@users.sourceforge.net> | 2003-04-22 23:30:29 +0000 |
|---|---|---|
| committer | Tim Champagne <tchamp@users.sourceforge.net> | 2003-04-22 23:30:29 +0000 |
| commit | 927f32b8bf5cb1bb64795aeca3b427c4e91ba0dc (patch) | |
| tree | f1bb3dccce867b7bf96e20dc8074f933dee7fef6 /src/video_out | |
| parent | 9d422a9e3c7cbd0d3dfdf8c077f24f9a8f035cec (diff) | |
| download | xine-lib-927f32b8bf5cb1bb64795aeca3b427c4e91ba0dc.tar.gz xine-lib-927f32b8bf5cb1bb64795aeca3b427c4e91ba0dc.tar.bz2 | |
Additional changes for win32/msvc port; This is my first real commit so please be gentle with me; Everything builds except for the win32 ui
CVS patchset: 4650
CVS date: 2003/04/22 23:30:29
Diffstat (limited to 'src/video_out')
| -rw-r--r-- | src/video_out/alphablend.h | 25 | ||||
| -rwxr-xr-x | src/video_out/video_out_directx.c | 2 |
2 files changed, 25 insertions, 2 deletions
diff --git a/src/video_out/alphablend.h b/src/video_out/alphablend.h index 759b61254..71ecc73cd 100644 --- a/src/video_out/alphablend.h +++ b/src/video_out/alphablend.h @@ -27,12 +27,35 @@ #include "video_out.h" +/* _MSC_VER port changes */ +#undef ATTRIBUTE_PACKED +#undef PRAGMA_PACK_BEGIN +#undef PRAGMA_PACK_END + +#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) +#define ATTRIBUTE_PACKED __attribute__ ((packed)) +#define PRAGMA_PACK 0 +#endif + +#if !defined(ATTRIBUTE_PACKED) +#define ATTRIBUTE_PACKED +#define PRAGMA_PACK 1 +#endif + +#if PRAGMA_PACK +#pragma pack(8) +#endif + typedef struct { /* CLUT == Color LookUp Table */ uint8_t cb : 8; uint8_t cr : 8; uint8_t y : 8; uint8_t foo : 8; -} __attribute__ ((packed)) clut_t; +} ATTRIBUTE_PACKED clut_t; + +#if PRAGMA_PACK +#pragma pack() +#endif void blend_rgb16 (uint8_t * img, vo_overlay_t * img_overl, int img_width, int img_height, diff --git a/src/video_out/video_out_directx.c b/src/video_out/video_out_directx.c index 590574da2..0bca356ba 100755 --- a/src/video_out/video_out_directx.c +++ b/src/video_out/video_out_directx.c @@ -1270,7 +1270,7 @@ static void *init_class (xine_t *xine, void *visual_gen) { static vo_info_t vo_info_win32 = { 7, /* priority */ - XINE_VISUAL_TYPE_WIN32 /* visual type */ + XINE_VISUAL_TYPE_DIRECTX /* visual type */ }; /* |