summaryrefslogtreecommitdiffstats
path: root/libvo/vo_fbdev2.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-05-07 22:13:35 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-05-07 22:13:35 +0300
commite1cd86076fc830bf2d475539543cf3dacc287ca7 (patch)
tree3651783063fcca8af4645f61f4196276d6f7f6a9 /libvo/vo_fbdev2.c
parent4c6e3ac01bb158ddaa5603dc93fc7efb91b367b1 (diff)
parent1292c8adc351b1bf461354cd632b39ec3303a8f2 (diff)
downloadmpv-e1cd86076fc830bf2d475539543cf3dacc287ca7.tar.bz2
mpv-e1cd86076fc830bf2d475539543cf3dacc287ca7.tar.xz
Merge svn changes up to r31141
Diffstat (limited to 'libvo/vo_fbdev2.c')
-rw-r--r--libvo/vo_fbdev2.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/libvo/vo_fbdev2.c b/libvo/vo_fbdev2.c
index 491911ad6c..60bdee9a17 100644
--- a/libvo/vo_fbdev2.c
+++ b/libvo/vo_fbdev2.c
@@ -77,6 +77,13 @@ static void set_bpp(struct fb_var_screeninfo *p, int bpp)
p->green.offset = 5;
p->blue.length = 5;
break;
+ case 12:
+ p->red.offset = 8;
+ p->green.length = 4;
+ p->red.length = 4;
+ p->green.offset = 4;
+ p->blue.length = 4;
+ break;
}
}
@@ -247,6 +254,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
case 24: draw_alpha_p = vo_draw_alpha_rgb24; break;
case 16: draw_alpha_p = vo_draw_alpha_rgb16; break;
case 15: draw_alpha_p = vo_draw_alpha_rgb15; break;
+ case 12: draw_alpha_p = vo_draw_alpha_rgb12; break;
default: return 1;
}