Merge commit '87f98a2b'

* commit '87f98a2b':
  fbdev: Support the RGB565 colour space.

Conflicts:
	libavdevice/fbdev_dec.c

See: 43d36599Merged-by: Michael Niedermayer <michael@niedermayer.cc>

libavdevice/fbdev_common.c

@@ -42,7 +42,7 @@ static const struct rgb_pixfmt_map_entry rgb_pixfmt_map[] = {
     {  32,       3,           2,           8,            0,   AV_PIX_FMT_ABGR  },
     {  24,       0,           8,          16,            0,   AV_PIX_FMT_RGB24 },
     {  24,      16,           8,           0,            0,   AV_PIX_FMT_BGR24 },
-    {  16,      11,           5,           0,           16,   AV_PIX_FMT_RGB565 },
+    {  16,      11,           5,           0,            0,   AV_PIX_FMT_RGB565 },
 };
 
 enum AVPixelFormat ff_get_pixfmt_from_fb_varinfo(struct fb_var_screeninfo *varinfo)