aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-07-11 12:22:44 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-07-11 12:25:03 +0200
commite76c34d08c6f90ed3d6402fa800081e20ddbc012 (patch)
tree60a62f1755e0091fe6d833ac8b63be290b99312c
parent0303d43964cdcab868d3f765282c00086f3a8123 (diff)
parent87f98a2b9d4c7218ad82bb45347a53b65e5244f3 (diff)
downloadffmpeg-e76c34d08c6f90ed3d6402fa800081e20ddbc012.tar.gz
Merge commit '87f98a2b9d4c7218ad82bb45347a53b65e5244f3'
* commit '87f98a2b9d4c7218ad82bb45347a53b65e5244f3': fbdev: Support the RGB565 colour space. Conflicts: libavdevice/fbdev_dec.c See: 43d36599fe3330913c6be9da5519dee048263dc9 Merged-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavdevice/fbdev_common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavdevice/fbdev_common.c b/libavdevice/fbdev_common.c
index 98f96de2af..91bd8e1a91 100644
--- a/libavdevice/fbdev_common.c
+++ b/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)