video-blend: Fix argument signedness
authorEdward Hervey <edward.hervey@collabora.co.uk>
Wed, 20 Jun 2012 08:35:04 +0000 (10:35 +0200)
committerEdward Hervey <edward.hervey@collabora.co.uk>
Fri, 13 Jul 2012 10:18:29 +0000 (12:18 +0200)
The x/y values are meant to be signed.

This bug was introduced by 76c0881549e73efb4995ac8b38d596d51d1cc0fe

Conflicts:

gst-libs/gst/video/video-blend.c
gst-libs/gst/video/video-blend.h

gst-libs/gst/video/video-blend.c
gst-libs/gst/video/video-blend.h

index db1727a..54118d0 100644 (file)
@@ -241,7 +241,7 @@ gst_video_blend_scale_linear_RGBA (GstVideoInfo * src, GstBuffer * src_buffer,
  */
 gboolean
 gst_video_blend (GstVideoFrame * dest,
-    GstVideoFrame * src, guint x, guint y, gfloat global_alpha)
+    GstVideoFrame * src, gint x, gint y, gfloat global_alpha)
 {
   guint i, j, global_alpha_val, src_width, src_height, dest_width, dest_height;
   gint xoff;
index 715dac9..906752b 100644 (file)
@@ -33,7 +33,7 @@ void       gst_video_blend_scale_linear_RGBA  (GstVideoInfo * src, GstBuffer * s
 
 gboolean   gst_video_blend                    (GstVideoFrame * dest,
                                                GstVideoFrame * src,
-                                               guint x, guint y,
+                                               gint x, gint y,
                                                gfloat global_alpha);
 
 #endif