diff options
| author | szabii <szabii@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-04-29 21:16:21 +0000 |
|---|---|---|
| committer | szabii <szabii@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-04-29 21:16:21 +0000 |
| commit | c9f210f269dce93ac6964dbacc3d9d2e39791470 (patch) | |
| tree | 2e65dca4830a957178e25ad217e4232ac2edb040 /libvo/vo_fbdev.c | |
| parent | c11555c175883ada2aad7f8278b8727a952d337b (diff) | |
| download | mpv-c9f210f269dce93ac6964dbacc3d9d2e39791470.tar.bz2 mpv-c9f210f269dce93ac6964dbacc3d9d2e39791470.tar.xz | |
nothing important
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@664 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vo_fbdev.c')
| -rw-r--r-- | libvo/vo_fbdev.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/libvo/vo_fbdev.c b/libvo/vo_fbdev.c index 0215c4d1ff..1f46d9018d 100644 --- a/libvo/vo_fbdev.c +++ b/libvo/vo_fbdev.c @@ -677,15 +677,13 @@ static int fb_preinit(void) } 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) { |