diff options
author | Tim-Philipp Müller <tim@centricular.net> | 2006-12-24 11:36:31 +0000 |
---|---|---|
committer | Tim-Philipp Müller <tim@centricular.net> | 2006-12-24 11:36:31 +0000 |
commit | 3d1e70c2d1fa17c98aa5e5894be853813294b5e4 (patch) | |
tree | c80c2221ceaf4c4b834f29850dc072123e541ed8 | |
parent | 7735292ec2300a00b1f7778a4c91e60843b4cec9 (diff) |
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.
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | sys/ximage/gstximagesrc.c | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -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)); |