diff --git a/gst/vaapi/gstvaapiencode_h264.c b/gst/vaapi/gstvaapiencode_h264.c
index 28656a94c9..aabe7bcdeb 100644
--- a/gst/vaapi/gstvaapiencode_h264.c
+++ b/gst/vaapi/gstvaapiencode_h264.c
@@ -78,30 +78,12 @@ GST_DEBUG_CATEGORY_STATIC (gst_vaapi_h264_encode_debug);
   "stream-format = (string) { avc, byte-stream }, " \
   "alignment = (string) au"
 
-/* *INDENT-OFF* */
-static const char gst_vaapiencode_h264_sink_caps_str[] =
-  GST_VAAPI_MAKE_SURFACE_CAPS ", "
-  GST_CAPS_INTERLACED_FALSE "; "
-  GST_VIDEO_CAPS_MAKE (GST_VAAPI_FORMATS_ALL) ", "
-  GST_CAPS_INTERLACED_FALSE ";"
-  GST_VIDEO_CAPS_MAKE_WITH_FEATURES(GST_CAPS_FEATURE_MEMORY_DMABUF, GST_VAAPI_FORMATS_ALL) ","
-  GST_CAPS_INTERLACED_FALSE;
-/* *INDENT-ON* */
-
 /* *INDENT-OFF* */
 static const char gst_vaapiencode_h264_src_caps_str[] =
   GST_CODEC_CAPS ", "
   "profile = (string) { constrained-baseline, baseline, main, high, multiview-high, stereo-high }";
 /* *INDENT-ON* */
 
-/* *INDENT-OFF* */
-static GstStaticPadTemplate gst_vaapiencode_h264_sink_factory =
-  GST_STATIC_PAD_TEMPLATE ("sink",
-      GST_PAD_SINK,
-      GST_PAD_ALWAYS,
-      GST_STATIC_CAPS (gst_vaapiencode_h264_sink_caps_str));
-/* *INDENT-ON* */
-
 /* *INDENT-OFF* */
 static GstStaticPadTemplate gst_vaapiencode_h264_src_factory =
   GST_STATIC_PAD_TEMPLATE ("src",
@@ -110,8 +92,10 @@ static GstStaticPadTemplate gst_vaapiencode_h264_src_factory =
       GST_STATIC_CAPS (gst_vaapiencode_h264_src_caps_str));
 /* *INDENT-ON* */
 
+#define EXTRA_FORMATS {}
+
 /* h264 encode */
-G_DEFINE_TYPE (GstVaapiEncodeH264, gst_vaapiencode_h264, GST_TYPE_VAAPIENCODE);
+GST_VAAPI_ENCODE_REGISTER_TYPE (h264, H264, H264, EXTRA_FORMATS);
 
 static void
 gst_vaapiencode_h264_init (GstVaapiEncodeH264 * encode)
@@ -568,16 +552,14 @@ error_convert_buffer:
 }
 
 static void
-gst_vaapiencode_h264_class_init (GstVaapiEncodeH264Class * klass)
+gst_vaapiencode_h264_class_init (GstVaapiEncodeH264Class * klass, gpointer data)
 {
   GObjectClass *const object_class = G_OBJECT_CLASS (klass);
   GstElementClass *const element_class = GST_ELEMENT_CLASS (klass);
   GstVaapiEncodeClass *const encode_class = GST_VAAPIENCODE_CLASS (klass);
+  GstCaps *sink_caps = GST_CAPS_CAST (data);
   gpointer encoder_class;
 
-  GST_DEBUG_CATEGORY_INIT (gst_vaapi_h264_encode_debug,
-      GST_PLUGIN_NAME, 0, GST_PLUGIN_DESC);
-
   object_class->finalize = gst_vaapiencode_h264_finalize;
   object_class->set_property = gst_vaapiencode_set_property_subclass;
   object_class->get_property = gst_vaapiencode_get_property_subclass;
@@ -595,8 +577,10 @@ gst_vaapiencode_h264_class_init (GstVaapiEncodeH264Class * klass)
       GST_PLUGIN_DESC, "Wind Yuan <feng.yuan@intel.com>");
 
   /* sink pad */
-  gst_element_class_add_static_pad_template (element_class,
-      &gst_vaapiencode_h264_sink_factory);
+  g_assert (sink_caps);
+  gst_element_class_add_pad_template (element_class,
+      gst_pad_template_new ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, sink_caps));
+  gst_caps_unref (sink_caps);
 
   /* src pad */
   gst_element_class_add_static_pad_template (element_class,
diff --git a/gst/vaapi/gstvaapiencode_h264.h b/gst/vaapi/gstvaapiencode_h264.h
index 46a0e8161a..f59797e22a 100644
--- a/gst/vaapi/gstvaapiencode_h264.h
+++ b/gst/vaapi/gstvaapiencode_h264.h
@@ -68,6 +68,9 @@ struct _GstVaapiEncodeH264Class
 GType
 gst_vaapiencode_h264_get_type (void) G_GNUC_CONST;
 
+GType
+gst_vaapiencode_h264_register_type (GstVaapiDisplay * display);
+
 G_END_DECLS
 
 #endif /* GST_VAAPIENCODE_H264_H */