[MPlayer-cvslog] CVS: main/libvo vo_fbdev.c, 1.92, 1.93 vo_fbdev2.c, 1.7, 1.8

[Alan Curry CVS]

CVS change done by Alan Curry CVS

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var2/tmp/cvs-serv26894/libvo

Modified Files:
	vo_fbdev.c vo_fbdev2.c 
Log Message:
Fix colormap save/restore for directcolor fb devices


Index: vo_fbdev.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_fbdev.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- vo_fbdev.c	5 Aug 2005 01:24:36 -0000	1.92
+++ vo_fbdev.c	17 Feb 2006 03:49:33 -0000	1.93
@@ -549,7 +549,8 @@
 static struct fb_fix_screeninfo fb_finfo;
 static struct fb_var_screeninfo fb_orig_vinfo;
 static struct fb_var_screeninfo fb_vinfo;
-static struct fb_cmap fb_oldcmap;
+static unsigned short fb_ored[256], fb_ogreen[256], fb_oblue[256];
+static struct fb_cmap fb_oldcmap = { 0, 256, fb_ored, fb_ogreen, fb_oblue };
 static int fb_cmap_changed = 0;
 static int fb_pixel_size;	// 32:  4  24:  3  16:  2  15:  2
 static int fb_bpp;		// 32: 32  24: 24  16: 16  15: 15

Index: vo_fbdev2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_fbdev2.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vo_fbdev2.c	5 Aug 2005 01:24:36 -0000	1.7
+++ vo_fbdev2.c	17 Feb 2006 03:49:33 -0000	1.8
@@ -72,7 +72,8 @@
 static struct fb_fix_screeninfo fb_finfo; // fixed info
 static struct fb_var_screeninfo fb_vinfo; // variable info
 static struct fb_var_screeninfo fb_orig_vinfo; // variable info to restore later
-static struct fb_cmap fb_oldcmap; // cmap to restore later
+static unsigned short fb_ored[256], fb_ogreen[256], fb_oblue[256];
+static struct fb_cmap fb_oldcmap = { 0, 256, fb_ored, fb_ogreen, fb_oblue };
 static int fb_cmap_changed = 0; //  to restore map
 static int fb_pixel_size;	// 32:  4  24:  3  16:  2  15:  2
 static int fb_bpp;		// 32: 32  24: 24  16: 16  15: 15