diff --git a/libavcodec/cbs_h265.c b/libavcodec/cbs_h265.c
index 21df609d08..9aedc7793c 100644
--- a/libavcodec/cbs_h265.c
+++ b/libavcodec/cbs_h265.c
@@ -142,7 +142,7 @@ static int FUNC_H265(name) args
                                         AV_INPUT_BUFFER_PADDING_SIZE); \
         if (!name ## _ref) \
             return AVERROR(ENOMEM); \
-        name = name ## _ref->data; \
+        name = (void *)name ## _ref->data; \
     } while (0)
 
 #define FUNC(name) FUNC_H265(name)
@@ -715,7 +715,18 @@ static void cbs_h265_free_sei(AVRefStructOpaque unused, void *content)
 }
 
 static CodedBitstreamUnitTypeDescriptor cbs_h265_unit_types[] = {
-    CBS_UNIT_TYPE_INTERNAL_REF(HEVC_NAL_VPS, H265RawVPS, extension_data.data),
+    {
+        .nb_unit_types     = 1,
+        .unit_type.list    = { HEVC_NAL_VPS },
+        .content_type      = CBS_CONTENT_TYPE_INTERNAL_REFS,
+        .content_size      = sizeof(H265RawVPS),
+        .type.ref          = {
+            .nb_offsets = 2,
+            .offsets    = { offsetof(H265RawVPS, extension_data.data),
+                            offsetof(H265RawVPS, hrd_parameters) }
+        },
+    },
+
     CBS_UNIT_TYPE_INTERNAL_REF(HEVC_NAL_SPS, H265RawSPS, extension_data.data),
     CBS_UNIT_TYPE_INTERNAL_REF(HEVC_NAL_PPS, H265RawPPS, extension_data.data),
 
diff --git a/libavcodec/cbs_h265.h b/libavcodec/cbs_h265.h
index bb7a29c2e5..cd84b7b594 100644
--- a/libavcodec/cbs_h265.h
+++ b/libavcodec/cbs_h265.h
@@ -211,7 +211,8 @@ typedef struct H265RawVPS {
     uint16_t vps_num_hrd_parameters;
     uint16_t hrd_layer_set_idx[HEVC_MAX_LAYER_SETS];
     uint8_t cprms_present_flag[HEVC_MAX_LAYER_SETS];
-    H265RawHRDParameters hrd_parameters[HEVC_MAX_LAYER_SETS];
+    H265RawHRDParameters *hrd_parameters;
+    AVBufferRef          *hrd_parameters_ref;
 
     uint8_t vps_extension_flag;
     H265RawExtensionData extension_data;
diff --git a/libavcodec/cbs_h265_syntax_template.c b/libavcodec/cbs_h265_syntax_template.c
index 2842c40585..c97b7ed361 100644
--- a/libavcodec/cbs_h265_syntax_template.c
+++ b/libavcodec/cbs_h265_syntax_template.c
@@ -489,6 +489,10 @@ static int FUNC(vps)(CodedBitstreamContext *ctx, RWContext *rw,
         if (current->vps_poc_proportional_to_timing_flag)
             ue(vps_num_ticks_poc_diff_one_minus1, 0, UINT32_MAX - 1);
         ue(vps_num_hrd_parameters, 0, current->vps_num_layer_sets_minus1 + 1);
+        if (current->vps_num_hrd_parameters > 0)
+            allocate(current->hrd_parameters,
+                     current->vps_num_hrd_parameters *
+                     sizeof(*current->hrd_parameters));
         for (i = 0; i < current->vps_num_hrd_parameters; i++) {
             ues(hrd_layer_set_idx[i],
                 current->vps_base_layer_internal_flag ? 0 : 1,