diff --git a/gst/vaapiconvert/gstvaapiconvert.c b/gst/vaapiconvert/gstvaapiconvert.c
index 1ccfae9f15..f10bafdcfc 100644
--- a/gst/vaapiconvert/gstvaapiconvert.c
+++ b/gst/vaapiconvert/gstvaapiconvert.c
@@ -49,7 +49,7 @@ static const GstElementDetails gst_vaapiconvert_details =
 /* Default templates */
 static const char gst_vaapiconvert_yuv_caps_str[] =
     "video/x-raw-yuv, "
-    "width = (int) [ 1, MAX ], "
+    "width  = (int) [ 1, MAX ], "
     "height = (int) [ 1, MAX ]; ";
 
 static const char gst_vaapiconvert_vaapi_caps_str[] =
@@ -83,8 +83,11 @@ enum {
     PROP_DIRECT_RENDERING,
 };
 
-static gboolean gst_vaapiconvert_start(GstBaseTransform *trans);
-static gboolean gst_vaapiconvert_stop(GstBaseTransform *trans);
+static gboolean
+gst_vaapiconvert_start(GstBaseTransform *trans);
+
+static gboolean
+gst_vaapiconvert_stop(GstBaseTransform *trans);
 
 static GstFlowReturn
 gst_vaapiconvert_transform(
@@ -151,7 +154,8 @@ gst_vaapiconvert_destroy(GstVaapiConvert *convert)
     }
 }
 
-static void gst_vaapiconvert_base_init(gpointer klass)
+static void
+gst_vaapiconvert_base_init(gpointer klass)
 {
     GstElementClass * const element_class = GST_ELEMENT_CLASS(klass);
 
@@ -291,7 +295,8 @@ gst_vaapiconvert_init(GstVaapiConvert *convert, GstVaapiConvertClass *klass)
     g_object_unref(sinkpad);
 }
 
-static gboolean gst_vaapiconvert_start(GstBaseTransform *trans)
+static gboolean
+gst_vaapiconvert_start(GstBaseTransform *trans)
 {
     GstVaapiConvert * const convert = GST_VAAPICONVERT(trans);
     GstVaapiVideoSink *sink;
@@ -310,7 +315,8 @@ static gboolean gst_vaapiconvert_start(GstBaseTransform *trans)
     return TRUE;
 }
 
-static gboolean gst_vaapiconvert_stop(GstBaseTransform *trans)
+static gboolean
+gst_vaapiconvert_stop(GstBaseTransform *trans)
 {
     GstVaapiConvert * const convert = GST_VAAPICONVERT(trans);
 
@@ -665,7 +671,8 @@ gst_vaapiconvert_prepare_output_buffer(
     return GST_FLOW_OK;
 }
 
-static gboolean plugin_init(GstPlugin *plugin)
+static gboolean
+plugin_init(GstPlugin *plugin)
 {
     GST_DEBUG_CATEGORY_INIT(gst_debug_vaapiconvert,
                             GST_PLUGIN_NAME, 0, GST_PLUGIN_DESC);
diff --git a/gst/vaapidecode/gstvaapidecode.c b/gst/vaapidecode/gstvaapidecode.c
index 130424a1b4..5d1f2be684 100644
--- a/gst/vaapidecode/gstvaapidecode.c
+++ b/gst/vaapidecode/gstvaapidecode.c
@@ -51,7 +51,7 @@ static const GstElementDetails gst_vaapidecode_details =
 /* Default templates */
 #define GST_CAPS_CODEC(CODEC)                   \
     CODEC ", "                                  \
-    "width = (int) [ 1, MAX ], "                \
+    "width  = (int) [ 1, MAX ], "               \
     "height = (int) [ 1, MAX ]; "
 
 static const char gst_vaapidecode_sink_caps_str[] =
@@ -537,7 +537,8 @@ gst_vaapidecode_init(GstVaapiDecode *decode, GstVaapiDecodeClass *klass)
     gst_element_add_pad(GST_ELEMENT(decode), decode->srcpad);
 }
 
-static gboolean plugin_init(GstPlugin *plugin)
+static gboolean
+plugin_init(GstPlugin *plugin)
 {
     GST_DEBUG_CATEGORY_INIT(gst_debug_vaapidecode,
                             GST_PLUGIN_NAME, 0, GST_PLUGIN_DESC);
diff --git a/gst/vaapisink/gstvaapisink.c b/gst/vaapisink/gstvaapisink.c
index 7c4ecfb130..baa2e71e03 100644
--- a/gst/vaapisink/gstvaapisink.c
+++ b/gst/vaapisink/gstvaapisink.c
@@ -90,12 +90,14 @@ gst_vaapi_video_sink_do_get_display(GstVaapiVideoSink *sink)
     return gst_vaapisink_get_display(GST_VAAPISINK(sink));
 }
 
-static void gst_vaapi_video_sink_iface_init(GstVaapiVideoSinkInterface *iface)
+static void
+gst_vaapi_video_sink_iface_init(GstVaapiVideoSinkInterface *iface)
 {
     iface->get_display = gst_vaapi_video_sink_do_get_display;
 }
 
-static void gst_vaapisink_iface_init(GType type)
+static void
+gst_vaapisink_iface_init(GType type)
 {
     const GType g_define_type_id = type;
 
@@ -571,7 +573,8 @@ gst_vaapisink_get_property(
     }
 }
 
-static void gst_vaapisink_base_init(gpointer klass)
+static void
+gst_vaapisink_base_init(gpointer klass)
 {
     GstElementClass * const element_class = GST_ELEMENT_CLASS(klass);
 
@@ -583,7 +586,8 @@ static void gst_vaapisink_base_init(gpointer klass)
     );
 }
 
-static void gst_vaapisink_class_init(GstVaapiSinkClass *klass)
+static void
+gst_vaapisink_class_init(GstVaapiSinkClass *klass)
 {
     GObjectClass * const     object_class   = G_OBJECT_CLASS(klass);
     GstBaseSinkClass * const basesink_class = GST_BASE_SINK_CLASS(klass);
@@ -653,7 +657,8 @@ static void gst_vaapisink_class_init(GstVaapiSinkClass *klass)
                               G_PARAM_READWRITE));
 }
 
-static void gst_vaapisink_init(GstVaapiSink *sink, GstVaapiSinkClass *klass)
+static void
+gst_vaapisink_init(GstVaapiSink *sink, GstVaapiSinkClass *klass)
 {
     sink->display_name   = NULL;
     sink->display        = NULL;
@@ -677,7 +682,8 @@ gst_vaapisink_get_display(GstVaapiSink *sink)
     return sink->display;
 }
 
-static gboolean plugin_init(GstPlugin *plugin)
+static gboolean
+plugin_init(GstPlugin *plugin)
 {
     GST_DEBUG_CATEGORY_INIT(gst_debug_vaapisink,
                             GST_PLUGIN_NAME, 0, GST_PLUGIN_DESC);