diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2009-05-28 14:01:17 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2009-05-28 14:01:17 +0200 |
| commit | d46e459f22750d9e298286ea0815328d0ae96821 (patch) | |
| tree | 019d82466c3553277aab415b41927991f97dc6ee /gst/videomixer | |
| parent | a5c30ae5028d054c5a3c4014d0eda1ea92d05b1f (diff) | |
videomixer: Don't use // comments
Diffstat (limited to 'gst/videomixer')
| -rw-r--r-- | gst/videomixer/blend_bgra.c | 8 | ||||
| -rw-r--r-- | gst/videomixer/blend_i420.c | 1 | ||||
| -rw-r--r-- | gst/videomixer/videomixer.c | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/gst/videomixer/blend_bgra.c b/gst/videomixer/blend_bgra.c index 485f0c76..1c9630ed 100644 --- a/gst/videomixer/blend_bgra.c +++ b/gst/videomixer/blend_bgra.c @@ -96,10 +96,10 @@ gst_videomixer_fill_bgra_checker (guint8 * dest, gint width, gint height) for (i = 0; i < height; i++) { for (j = 0; j < width; j++) { - *dest++ = tab[((i & 0x8) >> 3) + ((j & 0x8) >> 3)]; //blue - *dest++ = tab[((i & 0x8) >> 3) + ((j & 0x8) >> 3)]; //green - *dest++ = tab[((i & 0x8) >> 3) + ((j & 0x8) >> 3)]; //red - *dest++ = 0xFF; //alpha + *dest++ = tab[((i & 0x8) >> 3) + ((j & 0x8) >> 3)]; /* blue */ + *dest++ = tab[((i & 0x8) >> 3) + ((j & 0x8) >> 3)]; /* green */ + *dest++ = tab[((i & 0x8) >> 3) + ((j & 0x8) >> 3)]; /* red */ + *dest++ = 0xFF; /* alpha */ } } } diff --git a/gst/videomixer/blend_i420.c b/gst/videomixer/blend_i420.c index 08b5f9fe..a2e6c441 100644 --- a/gst/videomixer/blend_i420.c +++ b/gst/videomixer/blend_i420.c @@ -207,7 +207,6 @@ gst_videomixer_blend_i420_i420 (guint8 * src, gint xpos, gint ypos, gint src_width, gint src_height, gdouble src_alpha, guint8 * dest, gint dest_width, gint dest_height) { - //gint alpha, b_alpha; guint8 *b_src; guint8 *b_dest; gint b_src_width = src_width; diff --git a/gst/videomixer/videomixer.c b/gst/videomixer/videomixer.c index fd3e74ba..2d1ad190 100644 --- a/gst/videomixer/videomixer.c +++ b/gst/videomixer/videomixer.c @@ -360,7 +360,7 @@ gst_videomixer_pad_sink_acceptcaps (GstPad * pad, GstCaps * vscaps) GstCaps *caps1 = gst_caps_copy (acceptedCaps); GstCaps *caps2 = gst_caps_copy_nth (gst_pad_get_pad_template_caps (pad), i); - gst_caps_merge (caps1, caps2); //caps2 is unrefed + gst_caps_merge (caps1, caps2); gst_caps_do_simplify (caps1); if (GST_CAPS_IS_SIMPLE (caps1)) { gst_caps_replace (&acceptedCaps, caps1); |