From 3d1e70c2d1fa17c98aa5e5894be853813294b5e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.net>
Date: Sun, 24 Dec 2006 11:36:31 +0000
Subject: [PATCH] sys/ximage/gstximagesrc.c: Fix presumably copy'n'pasto for
 16bpp depth.

Original commit message from CVS:
* sys/ximage/gstximagesrc.c: (composite_pixel):
Fix presumably copy'n'pasto for 16bpp depth.
---
 ChangeLog                 | 5 +++++
 sys/ximage/gstximagesrc.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 43a8467284..def3d79bf3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-24  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* sys/ximage/gstximagesrc.c: (composite_pixel):
+	  Fix presumably copy'n'pasto for 16bpp depth.
+
 2006-12-24  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* gst/matroska/matroska-mux.c:
diff --git a/sys/ximage/gstximagesrc.c b/sys/ximage/gstximagesrc.c
index 720c1e3499..95dfae8942 100644
--- a/sys/ximage/gstximagesrc.c
+++ b/sys/ximage/gstximagesrc.c
@@ -265,7 +265,7 @@ composite_pixel (GstXContext * xcontext, guchar * dest, guchar * src)
       color = *dest;
       break;
     case 16:
-      color = GUINT16_FROM_LE (*(guint32 *) (dest));
+      color = GUINT16_FROM_LE (*(guint16 *) (dest));
       break;
     case 32:
       color = GUINT32_FROM_LE (*(guint32 *) (dest));