Mercurial > mplayer.hg

changeset 1076:52bbb0e913d8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8bpp fix
author szabii
date Sat, 09 Jun 2001 17:33:21 +0000
parents a981413af7cd
children c433e62cb3de
files libvo/vo_fbdev.c
diffstat 1 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vo_fbdev.c	Sat Jun 09 17:30:40 2001 +0000
+++ b/libvo/vo_fbdev.c	Sat Jun 09 17:33:21 2001 +0000
@@ -706,6 +706,11 @@
 
 	fb_bpp = fb_vinfo.bits_per_pixel;
 
+	if (fb_bpp == 8 && !vo_dbpp) {
+		printf(FBDEV "8 bpp output is not supported.\n");
+		goto err_out_fd;
+	}
+
 	/* 16 and 15 bpp is reported 16 bpp */
 	if (fb_bpp == 16)
 		fb_bpp = fb_vinfo.red.length + fb_vinfo.green.length +
@@ -715,7 +720,7 @@
 		if (vo_dbpp != 15 && vo_dbpp != 16 && vo_dbpp != 24 &&
 				vo_dbpp != 32) {
 			printf(FBDEV "can't switch to %d bpp\n", vo_dbpp);
-			goto err_out;
+			goto err_out_fd;
 		}
 		fb_bpp = vo_dbpp;		
 	}
@@ -897,7 +902,7 @@
 		fb_vinfo.blue.length;
 	fb_bpp = (fb_pixel_size == 4) ? 32 : fb_real_bpp;
 	if (fb_bpp_we_want != fb_bpp)
-		printf(FBDEV "requested %d bpp, got %d bpp)!!!\n",
+		printf(FBDEV "requested %d bpp, got %d bpp!!!\n",
 				fb_bpp_we_want, fb_bpp);
 
 	switch (fb_bpp) {