summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim.muller@collabora.co.uk>2013-05-16 11:35:58 +0100
committerTim-Philipp Müller <tim.muller@collabora.co.uk>2013-05-16 11:35:58 +0100
commit612e20d4f69862c172c973bcb84ea1db19110614 (patch)
treea59ec82c5675298c3314496aac9f8e33f99f3201
parent80e700a566cdfe03751a7e48ae7fe3b18d1c6fb6 (diff)
video: make mask arguments to gst_video_format_from_masks() unsigned
These should really be unsigned.
-rw-r--r--gst-libs/gst/video/video-format.c6
-rw-r--r--gst-libs/gst/video/video-format.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/gst-libs/gst/video/video-format.c b/gst-libs/gst/video/video-format.c
index 7fd60cfbb..96875098b 100644
--- a/gst-libs/gst/video/video-format.c
+++ b/gst-libs/gst/video/video-format.c
@@ -2143,11 +2143,11 @@ gst_video_format_from_rgb16_masks (int red_mask, int green_mask, int blue_mask)
* @depth: the amount of bits used for a pixel
* @bpp: the amount of bits used to store a pixel. This value is bigger than
* @depth
- * @endianness: the endianness of the masks
+ * @endianness: the endianness of the masks, #G_LITTLE_ENDIAN or #G_BIG_ENDIAN
* @red_mask: the red mask
* @green_mask: the green mask
* @blue_mask: the blue mask
- * @alpha_mask: the optional alpha mask
+ * @alpha_mask: the alpha mask, or 0 if no alpha mask
*
* Find the #GstVideoFormat for the given parameters.
*
@@ -2156,7 +2156,7 @@ gst_video_format_from_rgb16_masks (int red_mask, int green_mask, int blue_mask)
*/
GstVideoFormat
gst_video_format_from_masks (gint depth, gint bpp, gint endianness,
- gint red_mask, gint green_mask, gint blue_mask, gint alpha_mask)
+ guint red_mask, guint green_mask, guint blue_mask, guint alpha_mask)
{
GstVideoFormat format;
diff --git a/gst-libs/gst/video/video-format.h b/gst-libs/gst/video/video-format.h
index 427ed57b3..42b23e9e9 100644
--- a/gst-libs/gst/video/video-format.h
+++ b/gst-libs/gst/video/video-format.h
@@ -426,8 +426,8 @@ struct _GstVideoFormatInfo {
/* format properties */
GstVideoFormat gst_video_format_from_masks (gint depth, gint bpp, gint endianness,
- gint red_mask, gint green_mask,
- gint blue_mask, gint alpha_mask) G_GNUC_CONST;
+ guint red_mask, guint green_mask,
+ guint blue_mask, guint alpha_mask) G_GNUC_CONST;
GstVideoFormat gst_video_format_from_fourcc (guint32 fourcc) G_GNUC_CONST;
GstVideoFormat gst_video_format_from_string (const gchar *format) G_GNUC_CONST;