diff --git a/docs/reference/libs/libs-docs.xml.in b/docs/reference/libs/libs-docs.xml.in
index 474a64144a..a7873bdf4e 100644
--- a/docs/reference/libs/libs-docs.xml.in
+++ b/docs/reference/libs/libs-docs.xml.in
@@ -28,6 +28,7 @@
     <xi:include href="xml/gstvaapisurfacepool.xml"/>
     <xi:include href="xml/gstvaapiimagepool.xml"/>
     <xi:include href="xml/gstvaapivideobuffer.xml"/>
+    <xi:include href="xml/gstvaapivideometa.xml"/>
     <xi:include href="xml/gstvaapicontext.xml"/>
     <xi:include href="xml/gstvaapidecoder.xml"/>
     <xi:include href="xml/gstvaapidecoder_jpeg.xml"/>
diff --git a/docs/reference/libs/libs-sections.txt b/docs/reference/libs/libs-sections.txt
index bcbaf95970..11c742f6d6 100644
--- a/docs/reference/libs/libs-sections.txt
+++ b/docs/reference/libs/libs-sections.txt
@@ -140,6 +140,11 @@ gst_vaapi_display_get_image_caps
 gst_vaapi_display_has_image_format
 gst_vaapi_display_get_subpicture_caps
 gst_vaapi_display_has_subpicture_format
+gst_vaapi_display_has_property
+gst_vaapi_display_get_rotation
+gst_vaapi_display_set_rotation
+gst_vaapi_display_get_render_mode
+gst_vaapi_display_set_render_mode
 <SUBSECTION Standard>
 GST_VAAPI_DISPLAY
 GST_VAAPI_IS_DISPLAY
@@ -171,23 +176,8 @@ GST_VAAPI_IMAGE_POOL_GET_CLASS
 <TITLE>GstVaapiVideoBuffer</TITLE>
 GstVaapiVideoBuffer
 GstVaapiVideoBufferClass
-gst_vaapi_video_buffer_typed_new
-gst_vaapi_video_buffer_typed_new_from_pool
-gst_vaapi_video_buffer_typed_new_from_buffer
-gst_vaapi_video_buffer_typed_new_with_image
-gst_vaapi_video_buffer_typed_new_with_surface
-gst_vaapi_video_buffer_typed_new_with_surface_proxy
-gst_vaapi_video_buffer_get_display
-gst_vaapi_video_buffer_get_image
-gst_vaapi_video_buffer_set_image
-gst_vaapi_video_buffer_set_image_from_pool
-gst_vaapi_video_buffer_get_surface
-gst_vaapi_video_buffer_get_surface_proxy
-gst_vaapi_video_buffer_set_surface
-gst_vaapi_video_buffer_set_surface_proxy
-gst_vaapi_video_buffer_set_surface_from_pool
-gst_vaapi_video_buffer_get_render_flags
-gst_vaapi_video_buffer_set_render_flags
+gst_vaapi_video_buffer_new
+gst_vaapi_video_buffer_get_meta
 <SUBSECTION Standard>
 GST_VAAPI_VIDEO_BUFFER
 GST_VAAPI_IS_VIDEO_BUFFER
@@ -198,6 +188,34 @@ GST_VAAPI_IS_VIDEO_BUFFER_CLASS
 GST_VAAPI_VIDEO_BUFFER_GET_CLASS
 </SECTION>
 
+<SECTION>
+<FILE>gstvaapivideometa</FILE>
+<TITLE>GstVaapiVideoMeta</TITLE>
+gst_vaapi_video_meta_new
+gst_vaapi_video_meta_new_from_pool
+gst_vaapi_video_meta_new_with_image
+gst_vaapi_video_meta_new_with_surface
+gst_vaapi_video_meta_new_with_surface_proxy
+gst_vaapi_video_meta_ref
+gst_vaapi_video_meta_unref
+gst_vaapi_video_meta_replace
+gst_vaapi_video_meta_get_display
+gst_vaapi_video_meta_get_image
+gst_vaapi_video_meta_set_image
+gst_vaapi_video_meta_set_image_from_pool
+gst_vaapi_video_meta_get_surface
+gst_vaapi_video_meta_set_surface
+gst_vaapi_video_meta_set_surface_from_pool
+gst_vaapi_video_meta_set_surface_converter
+gst_vaapi_video_meta_get_surface_converter
+gst_vaapi_video_meta_get_surface_proxy
+gst_vaapi_video_meta_set_surface_proxy
+gst_vaapi_video_meta_get_render_flags
+gst_vaapi_video_meta_set_render_flags
+<SUBSECTION Standard>
+gst_vaapi_video_meta_get_type
+</SECTION>
+
 <SECTION>
 <FILE>gstvaapitypes</FILE>
 <TITLE>Basic data structures</TITLE>
@@ -345,7 +363,11 @@ GST_VAAPI_SURFACE_GET_CLASS
 GstVaapiSubpicture
 GstVaapiSubpictureClass
 gst_vaapi_subpicture_new
+gst_vaapi_subpicture_new_from_overlay_rectangle
 gst_vaapi_subpicture_get_id
+gst_vaapi_subpicture_get_flags
+gst_vaapi_subpicture_get_global_alpha
+gst_vaapi_subpicture_set_global_alpha
 gst_vaapi_subpicture_get_image
 gst_vaapi_subpicture_set_image
 <SUBSECTION Standard>
@@ -446,8 +468,13 @@ GstVaapiDecoderStatus
 GstVaapiDecoder
 GstVaapiDecoderClass
 gst_vaapi_decoder_get_caps
+gst_vaapi_decoder_get_codec
+gst_vaapi_decoder_get_codec_state
 gst_vaapi_decoder_put_buffer
 gst_vaapi_decoder_get_surface
+gst_vaapi_decoder_get_frame
+gst_vaapi_decoder_parse
+gst_vaapi_decoder_decode
 <SUBSECTION Standard>
 GST_VAAPI_DECODER
 GST_VAAPI_IS_DECODER
diff --git a/gst-libs/gst/vaapi/gstvaapidecoder_objects.h b/gst-libs/gst/vaapi/gstvaapidecoder_objects.h
index 2dcdde3f21..f6066e9cb2 100644
--- a/gst-libs/gst/vaapi/gstvaapidecoder_objects.h
+++ b/gst-libs/gst/vaapi/gstvaapidecoder_objects.h
@@ -55,7 +55,7 @@ typedef enum {
 } GstVaapiPictureType;
 
 /**
- * Picture flags:
+ * GstVaapiPictureFlags:
  * @GST_VAAPI_PICTURE_FLAG_SKIPPED: skipped frame
  * @GST_VAAPI_PICTURE_FLAG_REFERENCE: reference frame
  * @GST_VAAPI_PICTURE_FLAG_OUTPUT: frame was output
@@ -66,7 +66,7 @@ typedef enum {
  *
  * Enum values used for #GstVaapiPicture flags.
  */
-enum {
+typedef enum {
     GST_VAAPI_PICTURE_FLAG_SKIPPED    = (GST_VAAPI_CODEC_OBJECT_FLAG_LAST << 0),
     GST_VAAPI_PICTURE_FLAG_REFERENCE  = (GST_VAAPI_CODEC_OBJECT_FLAG_LAST << 1),
     GST_VAAPI_PICTURE_FLAG_OUTPUT     = (GST_VAAPI_CODEC_OBJECT_FLAG_LAST << 2),
@@ -74,7 +74,7 @@ enum {
     GST_VAAPI_PICTURE_FLAG_FF         = (GST_VAAPI_CODEC_OBJECT_FLAG_LAST << 4),
     GST_VAAPI_PICTURE_FLAG_TFF        = (GST_VAAPI_CODEC_OBJECT_FLAG_LAST << 5),
     GST_VAAPI_PICTURE_FLAG_LAST       = (GST_VAAPI_CODEC_OBJECT_FLAG_LAST << 6),
-};
+} GstVaapiPictureFlags;
 
 #define GST_VAAPI_PICTURE_FLAGS         GST_VAAPI_MINI_OBJECT_FLAGS
 #define GST_VAAPI_PICTURE_FLAG_IS_SET   GST_VAAPI_MINI_OBJECT_FLAG_IS_SET
diff --git a/gst-libs/gst/vaapi/gstvaapidisplay.c b/gst-libs/gst/vaapi/gstvaapidisplay.c
index 4677a79bdb..f8acf62fb2 100644
--- a/gst-libs/gst/vaapi/gstvaapidisplay.c
+++ b/gst-libs/gst/vaapi/gstvaapidisplay.c
@@ -1406,7 +1406,7 @@ gst_vaapi_display_get_subpicture_caps(GstVaapiDisplay *display)
  * gst_vaapi_display_has_subpicture_format:
  * @display: a #GstVaapiDisplay
  * @format: a #GstVaapiFormat
- * @flags: #GstVaapiSubpictureFlags, or zero
+ * @flags_ptr: pointer to #GstVaapiSubpictureFlags, or zero
  *
  * Returns whether VA @display supports @format subpicture format with
  * the supplied @flags.
diff --git a/gst-libs/gst/vaapi/gstvaapiprofile.h b/gst-libs/gst/vaapi/gstvaapiprofile.h
index a3a0f95d61..1be5f8ffa1 100644
--- a/gst-libs/gst/vaapi/gstvaapiprofile.h
+++ b/gst-libs/gst/vaapi/gstvaapiprofile.h
@@ -35,6 +35,7 @@ G_BEGIN_DECLS
  * @GST_VAAPI_CODEC_H264: H.264 aka MPEG-4 Part 10 (ISO/IEC 14496-10)
  * @GST_VAAPI_CODEC_WMV3: Windows Media Video 9. VC-1 Simple or Main profile (SMPTE 421M)
  * @GST_VAAPI_CODEC_VC1: VC-1 Advanced profile (SMPTE 421M)
+ * @GST_VAAPI_CODEC_JPEG: JPEG (ITU-T 81)
  *
  * The set of all codecs for #GstVaapiCodec.
  */
@@ -92,6 +93,8 @@ typedef enum {
  *   VC-1 main profile
  * @GST_VAAPI_PROFILE_VC1_ADVANCED:
  *   VC-1 advanced profile
+ * @GST_VAAPI_PROFILE_JPEG_BASELINE:
+ *   JPEG baseline profile
  *
  * The set of all profiles for #GstVaapiProfile.
  */