Mercurial > mplayer.hg

changeset 663:121cb2047c08

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nothing important
author szabii
date Sun, 29 Apr 2001 21:16:21 +0000
parents 4a959b73d51e
children 50cca1591b15
files libvo/vo_fbdev.c
diffstat 1 files changed, 7 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vo_fbdev.c	Sun Apr 29 20:24:38 2001 +0000
+++ b/libvo/vo_fbdev.c	Sun Apr 29 21:16:21 2001 +0000
@@ -677,15 +677,13 @@
 	}
 	fb_orig_vinfo = fb_vinfo;
 
-/*
-	fb_bpp = (fb_vinfo.bits_per_pixel == 32) ? 32 :
-		(fb_vinfo.red.length + fb_vinfo.green.length +
-		 fb_vinfo.blue.length);
-*/
-#warning FIXME
-	/* nemigy kellene bpp-t meghatarozni */
-	fb_bpp = (fb_vinfo.bits_per_pixel == 32) ? 32 :
-		(fb_vinfo.red.length + fb_vinfo.red.offset);
+	fb_bpp = fb_vinfo.bits_per_pixel;
+
+	/* 16 and 15 bpp is reported 16 bpp */
+	if (fb_bpp == 16)
+		fb_bpp = fb_vinfo.red.length + fb_vinfo.green.length +
+			fb_vinfo.blue.length;
+
 	if (vo_dbpp) {
 		if (vo_dbpp != 15 && vo_dbpp != 16 && vo_dbpp != 24 &&
 				vo_dbpp != 32) {