summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuotao Fu <l.fu@pengutronix.de>2008-12-23 12:25:47 +0000
committerWim Taymans <wim.taymans@gmail.com>2008-12-23 12:25:47 +0000
commit382bbcbd2b83bdd17ff4e127ee429901985b95ad (patch)
treea7da03e0086413890fef078b2cfc50b9f3e5b381
parent21ce049f2a444409eddd1a1599bf7e5a39682b14 (diff)
downloadgst-plugins-bad-382bbcbd2b83bdd17ff4e127ee429901985b95ad.tar.gz
gst-plugins-bad-382bbcbd2b83bdd17ff4e127ee429901985b95ad.tar.bz2
gst-plugins-bad-382bbcbd2b83bdd17ff4e127ee429901985b95ad.zip
sys/fbdev/gstfbdevsink.c: Fix the Depth calculation.
Original commit message from CVS: Patch by: Luotao Fu <l dot fu at pengutronix dot de> * sys/fbdev/gstfbdevsink.c: (gst_fbdevsink_getcaps): Fix the Depth calculation. Fixes #564114.
-rw-r--r--ChangeLog8
-rw-r--r--sys/fbdev/gstfbdevsink.c6
2 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index eba4c355..fd1f5f5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2008-12-23 Wim Taymans <wim.taymans@collabora.co.uk>
+ Patch by: Luotao Fu <l dot fu at pengutronix dot de>
+
+ * sys/fbdev/gstfbdevsink.c: (gst_fbdevsink_getcaps):
+ Fix the Depth calculation.
+ Fixes #564114.
+
+2008-12-23 Wim Taymans <wim.taymans@collabora.co.uk>
+
Patch by: Arnout Vandecappelle <arnout at mind dot be>
* gst/rtpmanager/rtpjitterbuffer.c: (rtp_jitter_buffer_reset_skew),
diff --git a/sys/fbdev/gstfbdevsink.c b/sys/fbdev/gstfbdevsink.c
index 0fb7d981..6975f55d 100644
--- a/sys/fbdev/gstfbdevsink.c
+++ b/sys/fbdev/gstfbdevsink.c
@@ -188,8 +188,10 @@ gst_fbdevsink_getcaps (GstBaseSink * bsink)
caps = gst_caps_from_string (GST_VIDEO_CAPS_RGB_15);
gst_caps_set_simple (caps,
"bpp", G_TYPE_INT, fbdevsink->varinfo.bits_per_pixel,
- "depth", G_TYPE_INT, fbdevsink->varinfo.bits_per_pixel
- - fbdevsink->varinfo.transp.length,
+ "depth", G_TYPE_INT, fbdevsink->varinfo.red.length +
+ fbdevsink->varinfo.green.length +
+ fbdevsink->varinfo.blue.length +
+ fbdevsink->varinfo.transp.length,
"endianness", G_TYPE_INT, endianness,
"red_mask", G_TYPE_INT, rmask,
"green_mask", G_TYPE_INT, gmask, "blue_mask", G_TYPE_INT, bmask, NULL);