diff options
author | szabii <szabii@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-04-12 23:23:29 +0000 |
---|---|---|
committer | szabii <szabii@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-04-12 23:23:29 +0000 |
commit | 9daf9a82ba77041831bd87106201bb0ecb1ec9f6 (patch) | |
tree | ea760f01b3d98b3db442605f6bf8c1f70a9ec795 /libvo/vo_fbdev.c | |
parent | 5bdd06d3f012adb9a482fe95ad008f5d27471044 (diff) | |
download | mpv-9daf9a82ba77041831bd87106201bb0ecb1ec9f6.tar.bz2 mpv-9daf9a82ba77041831bd87106201bb0ecb1ec9f6.tar.xz |
some fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@384 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vo_fbdev.c')
-rw-r--r-- | libvo/vo_fbdev.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/libvo/vo_fbdev.c b/libvo/vo_fbdev.c index 81e0d64932..fb07852594 100644 --- a/libvo/vo_fbdev.c +++ b/libvo/vo_fbdev.c @@ -247,6 +247,10 @@ static int parse_fbmode_cfg(char *cfgfile) goto err_out_parse_error; } else if (!strcmp(token[0], "endmode")) { /* NOTHING for now*/ + } else if (!strcmp(token[0], "accel")) { + if (get_token(1) < 0) + goto err_out_parse_error; + /* NOTHING for now*/ } else if (!strcmp(token[0], "hsync")) { if (get_token(1) < 0) goto err_out_parse_error; @@ -487,10 +491,10 @@ static int fb_init(void) if (fb_mode_name) { if (parse_fbmode_cfg(fb_mode_cfgfile) < 0) - return 1; + goto err_out; if (!(fb_mode = find_mode_by_name(fb_mode_name))) { printf("fb: can't find requested video mode\n"); - return 1; + goto err_out; } fb_switch_mode = 1; } else if (fb_mode_depth) { @@ -499,7 +503,7 @@ static int fb_init(void) if (fb_mode_depth != 15 && fb_mode_depth != 16 && fb_mode_depth != 24 && fb_mode_depth != 32) { printf("fb: can't switch to %d bpp\n", fb_mode_depth); - return 1; + goto err_out; } } @@ -603,6 +607,9 @@ static int fb_init(void) free(cmap->blue); free(cmap); break; + case FB_VISUAL_PSEUDOCOLOR: + printf("fb: visual is FB_VISUAL_PSEUDOCOLOR. it's not tested!\n"); + break; default: printf("fb: visual: %d not yet supported\n", fb_finfo.visual); |