Merge branch 'master' into 0.11

[platform/upstream/gstreamer.git] / gst-libs / gst / video / video-overlay-composition.c

diff --git a/gst-libs/gst/video/video-overlay-composition.c b/gst-libs/gst/video/video-overlay-composition.c
index 4633b6b..9bf887f 100644 (file)
--- a/gst-libs/gst/video/video-overlay-composition.c
+++ b/gst-libs/gst/video/video-overlay-composition.c
@@ -522,7 +522,7 @@ gst_video_overlay_composition_blend (GstVideoOverlayComposition * comp,
     video_blend_format_info_init (&rectangle_info,
         GST_BUFFER_DATA (rect->pixels), rect->height, rect->width,
         rect->format,
-        !!(rect->flags & GST_VIDEO_OVERLAY_FORMAT_FLAG_PREMULTIPLIED_ALPHA));
+        ! !(rect->flags & GST_VIDEO_OVERLAY_FORMAT_FLAG_PREMULTIPLIED_ALPHA));
 
     needs_scaling = gst_video_overlay_rectangle_needs_scaling (rect);
     if (needs_scaling) {
@@ -732,9 +732,9 @@ gst_video_overlay_rectangle_is_same_alpha_type (GstVideoOverlayFormatFlags
  * @width: the width of the rectangle in @pixels
  * @height: the height of the rectangle in @pixels
  * @stride: the stride of the rectangle in @pixels in bytes (>= 4*width)
- * @x: the X co-ordinate on the video where the top-left corner of this
+ * @render_x: the X co-ordinate on the video where the top-left corner of this
  *     overlay rectangle should be rendered to
- * @y: the Y co-ordinate on the video where the top-left corner of this
+ * @render_y: the Y co-ordinate on the video where the top-left corner of this
  *     overlay rectangle should be rendered to
  * @render_width: the render width of this rectangle on the video
  * @render_height: the render height of this rectangle on the video
@@ -951,7 +951,8 @@ gst_video_overlay_rectangle_get_pixels_argb_internal (GstVideoOverlayRectangle *
   /* not cached yet, do the scaling and put the result into our cache */
   video_blend_format_info_init (&info, GST_BUFFER_DATA (rectangle->pixels),
       rectangle->height, rectangle->width, rectangle->format,
-      !!(rectangle->flags & GST_VIDEO_OVERLAY_FORMAT_FLAG_PREMULTIPLIED_ALPHA));
+      ! !(rectangle->flags &
+          GST_VIDEO_OVERLAY_FORMAT_FLAG_PREMULTIPLIED_ALPHA));
 
   if (wanted_width != rectangle->width || wanted_height != rectangle->height) {
     video_blend_scale_linear_RGBA (&info, wanted_height, wanted_width);
@@ -1015,7 +1016,7 @@ gst_video_overlay_rectangle_get_pixels_argb (GstVideoOverlayRectangle *
  * @rectangle: a #GstVideoOverlayRectangle
  * @width: (out): address where to store the width of the unscaled
  *    rectangle in pixels
- * @width: (out): address where to store the height of the unscaled
+ * @height: (out): address where to store the height of the unscaled
  *    rectangle in pixels
  * @stride: (out): address of guint variable where to store the row
  *    stride of the ARGB pixel data in the buffer