Use gtypes.

diff --git a/gst-libs/gst/vaapi/gstvaapidisplay.c b/gst-libs/gst/vaapi/gstvaapidisplay.c
index ad3f2a616d9ef5741b98531ed94715953d968919..78dec96ddd3c3055b14145ffb38bdc85fbfad303 100644 (file)
--- a/gst-libs/gst/vaapi/gstvaapidisplay.c
+++ b/gst-libs/gst/vaapi/gstvaapidisplay.c
@@ -40,12 +40,12 @@ struct _GstVaapiDisplayPrivate {
     VADisplay           display;
     gboolean            create_display;
     VAProfile          *profiles;
-    unsigned int        num_profiles;
+    guint               num_profiles;
     VAImageFormat      *image_formats;
-    unsigned int        num_image_formats;
+    guint               num_image_formats;
     VAImageFormat      *subpicture_formats;
-    unsigned int       *subpicture_flags;
-    unsigned int        num_subpicture_formats;
+    guint              *subpicture_flags;
+    guint               num_subpicture_formats;
 };
 
 enum {
@@ -57,7 +57,7 @@ enum {
 static void
 append_format(
     VAImageFormat     **pva_formats,
-    unsigned int       *pnum_va_formats,
+    guint              *pnum_va_formats,
     GstVaapiImageFormat format
 )
 {
@@ -80,9 +80,9 @@ append_format(
 }
 
 static void
-filter_formats(VAImageFormat **pva_formats, unsigned int *pnum_va_formats)
+filter_formats(VAImageFormat **pva_formats, guint *pnum_va_formats)
 {
-    unsigned int i = 0;
+    guint i = 0;
     gboolean has_YV12 = FALSE;
     gboolean has_I420 = FALSE;
 
@@ -204,7 +204,7 @@ gst_vaapi_display_create(GstVaapiDisplay *display)
     GstVaapiDisplayPrivate * const priv = display->priv;
     VAStatus status;
     int major_version, minor_version;
-    unsigned int i;
+    guint i;
 
     if (!priv->display && priv->create_display) {
         GstVaapiDisplayClass *klass = GST_VAAPI_DISPLAY_GET_CLASS(display);
@@ -266,7 +266,7 @@ gst_vaapi_display_create(GstVaapiDisplay *display)
     priv->subpicture_formats = g_new(VAImageFormat, priv->num_subpicture_formats);
     if (!priv->subpicture_formats)
         return FALSE;
-    priv->subpicture_flags = g_new(unsigned int, priv->num_subpicture_formats);
+    priv->subpicture_flags = g_new(guint, priv->num_subpicture_formats);
     if (!priv->subpicture_flags)
         return FALSE;
     status = vaQuerySubpictureFormats(
@@ -473,10 +473,10 @@ _gst_vaapi_display_has_format(
     GstVaapiDisplay     *display,
     GstVaapiImageFormat  format,
     const VAImageFormat *va_formats,
-    unsigned int         num_va_formats
+    guint                num_va_formats
 )
 {
-    unsigned int i;
+    guint i;
 
     g_return_val_if_fail(format != 0, FALSE);
 
@@ -490,11 +490,11 @@ static GstCaps *
 _gst_vaapi_display_get_caps(
     GstVaapiDisplay     *display,
     const VAImageFormat *va_formats,
-    unsigned int         num_va_formats
+    guint                num_va_formats
 )
 {
     GstCaps *out_caps;
-    unsigned int i;
+    guint i;
 
     out_caps = gst_caps_new_empty();
     if (!out_caps)

diff --git a/gst-libs/gst/vaapi/gstvaapiimage.c b/gst-libs/gst/vaapi/gstvaapiimage.c
index 1d793a8ee7ff4c03bc6e703a19e64493ec74d974..4b0fd47b6439b0d07c578525d2b174b144bddad1 100644 (file)
--- a/gst-libs/gst/vaapi/gstvaapiimage.c
+++ b/gst-libs/gst/vaapi/gstvaapiimage.c
@@ -58,7 +58,7 @@ enum {
 };
 
 #define SWAP_UINT(a, b) do { \
-        unsigned int v = a;  \
+        guint v = a;         \
         a = b;               \
         b = v;               \
     } while (0)

diff --git a/gst-libs/gst/vaapi/gstvaapiutils_x11.c b/gst-libs/gst/vaapi/gstvaapiutils_x11.c
index dcc95b5363af42f562eb986f301a409b95e018bb..1cfb66bd00737524ce6afd028836ea1df4d636a1 100644 (file)
--- a/gst-libs/gst/vaapi/gstvaapiutils_x11.c
+++ b/gst-libs/gst/vaapi/gstvaapiutils_x11.c
@@ -56,7 +56,7 @@ static const int x11_event_mask = (KeyPressMask |
                                    StructureNotifyMask);
 
 Window
-x11_create_window(Display *display, unsigned int width, unsigned int height)
+x11_create_window(Display *display, guint width, guint height)
 {
     Window root_window, window;
     int screen, depth;
@@ -110,7 +110,7 @@ x11_get_geometry(
 {
     Window rootwin;
     int x, y;
-    unsigned int width, height, border_width, depth;
+    guint width, height, border_width, depth;
 
     x11_trap_errors();
     XGetGeometry(

diff --git a/gst-libs/gst/vaapi/gstvaapiutils_x11.h b/gst-libs/gst/vaapi/gstvaapiutils_x11.h
index f6ed6825ed7e611011ff246cb0e826ef3fa01777..402f00817f16ea8b6cb1b3a87224b9e6cac66bdf 100644 (file)
--- a/gst-libs/gst/vaapi/gstvaapiutils_x11.h
+++ b/gst-libs/gst/vaapi/gstvaapiutils_x11.h
@@ -32,7 +32,7 @@ int x11_untrap_errors(void)
     attribute_hidden;
 
 Window
-x11_create_window(Display *display, unsigned int width, unsigned int height)
+x11_create_window(Display *display, guint width, guint height)
     attribute_hidden;
 
 gboolean

diff --git a/gst-libs/gst/vaapi/gstvaapiwindow_x11.c b/gst-libs/gst/vaapi/gstvaapiwindow_x11.c
index 63526d35c9687b4f4fc3d6ce4eee3533ed943b31..58fe7f9140a1ff2e6700ddd4e5c61111a6ae024b 100644 (file)
--- a/gst-libs/gst/vaapi/gstvaapiwindow_x11.c
+++ b/gst-libs/gst/vaapi/gstvaapiwindow_x11.c
@@ -36,8 +36,8 @@ G_DEFINE_TYPE(GstVaapiWindowX11, gst_vaapi_window_x11, GST_VAAPI_TYPE_WINDOW);
 struct _GstVaapiWindowX11Private {
     GstVaapiDisplay    *display;
     Window              xid;
-    unsigned int        create_window   : 1;
-    unsigned int        is_visible      : 1;
+    guint               create_window   : 1;
+    guint               is_visible      : 1;
 };
 
 enum {
@@ -169,7 +169,7 @@ gst_vaapi_window_x11_render(
     GstVaapiDisplay *display;
     VASurfaceID surface_id;
     VAStatus status;
-    unsigned int va_flags = 0;
+    guint va_flags = 0;
 
     display = gst_vaapi_surface_get_display(surface);
     if (!display)

diff --git a/sys/vaapiconvert/gstvaapiconvert.h b/sys/vaapiconvert/gstvaapiconvert.h
index aee556ddbfa89f5e8e15d2fe1cc780bd72238c45..b37ff2d73257dd2a5edbf5b72026d88f4668cadc 100644 (file)
--- a/sys/vaapiconvert/gstvaapiconvert.h
+++ b/sys/vaapiconvert/gstvaapiconvert.h
@@ -71,7 +71,7 @@ struct _GstVaapiConvert {
     GstVaapiVideoPool  *surfaces;
     guint               surface_width;
     guint               surface_height;
-    unsigned int        use_inout_buffers : 1;
+    guint               use_inout_buffers : 1;
 };
 
 struct _GstVaapiConvertClass {