Mercurial > mplayer.hg

changeset 17637:479b64764d9e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix colormap save/restore for directcolor fb devices
author pacman
date Fri, 17 Feb 2006 03:49:33 +0000
parents b849a99cdc3c
children ee8d71a1b7ba
files libvo/vo_fbdev.c libvo/vo_fbdev2.c
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vo_fbdev.c	Fri Feb 17 01:57:41 2006 +0000
+++ b/libvo/vo_fbdev.c	Fri Feb 17 03:49:33 2006 +0000
@@ -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
--- a/libvo/vo_fbdev2.c	Fri Feb 17 01:57:41 2006 +0000
+++ b/libvo/vo_fbdev2.c	Fri Feb 17 03:49:33 2006 +0000
@@ -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