summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sys/ximage/gstximagesrc.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 43a84672..def3d79b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
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:
(gst_matroska_mux_audio_pad_setcaps):
The "signed" field in audio caps is of boolean type, trying to use
diff --git a/sys/ximage/gstximagesrc.c b/sys/ximage/gstximagesrc.c
index 720c1e34..95dfae89 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));