From 3eb5378247d2a300f51a061eddd94a594bd445a5 Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Wed, 20 Jun 2012 10:35:04 +0200 Subject: [PATCH] video-blend: Fix argument signedness 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 | 2 +- gst-libs/gst/video/video-blend.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gst-libs/gst/video/video-blend.c b/gst-libs/gst/video/video-blend.c index db1727a9f3..54118d08be 100644 --- a/gst-libs/gst/video/video-blend.c +++ b/gst-libs/gst/video/video-blend.c @@ -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; diff --git a/gst-libs/gst/video/video-blend.h b/gst-libs/gst/video/video-blend.h index 715dac9ef6..906752baf9 100644 --- a/gst-libs/gst/video/video-blend.h +++ b/gst-libs/gst/video/video-blend.h @@ -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