From ca2af66c93c2a86f27ca645d92148faca797708c Mon Sep 17 00:00:00 2001
From: Robin KAY <komadori@users.sourceforge.net>
Date: Sat, 2 Nov 2002 04:31:06 +0000
Subject: Fixed support for 8 bit colour in pgx64. Changed xine_check only to
 include Xv headers on Linux. Added pgx64 to ChangeLog. Made AUTHORS pretty
 again.

CVS patchset: 3139
CVS date: 2002/11/02 04:31:06
---
 src/video_out/video_out_pgx64.c | 4 ++--
 src/xine-utils/xine_check.c     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/video_out/video_out_pgx64.c b/src/video_out/video_out_pgx64.c
index 54e7fe195..7d3fc2d4d 100644
--- a/src/video_out/video_out_pgx64.c
+++ b/src/video_out/video_out_pgx64.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  *
- * $Id: video_out_pgx64.c,v 1.11 2002/10/29 17:08:54 komadori Exp $
+ * $Id: video_out_pgx64.c,v 1.12 2002/11/02 04:31:06 komadori Exp $
  *
  * video_out_pgx64.c, Sun PGX64/PGX24 output plugin for xine
  *
@@ -701,7 +701,7 @@ static pgx64_driver_t* init_driver(pgx64_driver_class_t *class)
   write_reg(this, SCALER_COLOUR_CNTL, (this->saturation<<16) | (this->saturation<<8) | (this->brightness&0x7F));
   write_reg(this, OVERLAY_KEY_CNTL, 0x00000050);
   write_reg(this, OVERLAY_GRAPHICS_KEY_CLR, this->colour_key);
-  write_reg(this, OVERLAY_GRAPHICS_KEY_MSK, 0x00ffffff);
+  write_reg(this, OVERLAY_GRAPHICS_KEY_MSK, 0xffffffff >> (32 - attr.fbtype.fb_depth));
 
   return this;
 }
diff --git a/src/xine-utils/xine_check.c b/src/xine-utils/xine_check.c
index cf867d910..f14d7f795 100644
--- a/src/xine-utils/xine_check.c
+++ b/src/xine-utils/xine_check.c
@@ -36,7 +36,6 @@
 #include "xine_check.h"
 #include "xineutils.h"
 #include <X11/Xlib.h>
-#include <X11/extensions/Xvlib.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/utsname.h>
@@ -47,6 +46,7 @@
 #if defined(__linux__)
 #include <linux/major.h>
 #include <linux/hdreg.h>
+#include <X11/extensions/Xvlib.h>
 
 xine_health_check_t*
 xine_health_check (xine_health_check_t* hc) {
-- 
cgit v1.2.3