mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-18 05:16:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

videomixer: Don't use // comments

Browse source
This commit is contained in:
Sebastian Dröge 2009-05-28 14:01:17 +02:00
parent a5c30ae502
commit d46e459f22
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst/videomixer/blend_bgra.c
View file

@ -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 */
}
}
}

1
gst/videomixer/blend_i420.c
View file

@ -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;

2
gst/videomixer/videomixer.c
View file

@ -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);