diff --git a/gst-libs/gst/codecparsers/gsth264parser.c b/gst-libs/gst/codecparsers/gsth264parser.c
index 2b0993f7d2..251e4bb6fd 100644
--- a/gst-libs/gst/codecparsers/gsth264parser.c
+++ b/gst-libs/gst/codecparsers/gsth264parser.c
@@ -1046,8 +1046,10 @@ gst_h264_parser_parse_registered_user_data (GstH264NalParser * nalparser,
   rud->data = NULL;
   rud->size = 0;
 
-  if (payload_size < 2)
-    return GST_H264_PARSER_ERROR;
+  if (payload_size < 2) {
+    GST_WARNING ("Too small payload size %d", payload_size);
+    return GST_H264_PARSER_BROKEN_DATA;
+  }
 
   READ_UINT8 (nr, rud->country_code, 8);
   --payload_size;
@@ -1059,15 +1061,17 @@ gst_h264_parser_parse_registered_user_data (GstH264NalParser * nalparser,
     rud->country_code_extension = 0;
   }
 
-  if (payload_size < 8)
-    return GST_H264_PARSER_ERROR;
+  if (payload_size < 1) {
+    GST_WARNING ("No more remaining payload data to store");
+    return GST_H264_PARSER_BROKEN_DATA;
+  }
 
   data = g_malloc (payload_size);
-  for (i = 0; i < payload_size / 8; ++i) {
+  for (i = 0; i < payload_size; ++i) {
     READ_UINT8 (nr, data[i], 8);
   }
 
-  GST_MEMDUMP ("SEI user data", data, payload_size / 8);
+  GST_MEMDUMP ("SEI user data", data, payload_size);
 
   rud->data = data;
   rud->size = payload_size;
@@ -1274,7 +1278,7 @@ gst_h264_parser_parse_sei_message (GstH264NalParser * nalparser,
       break;
     case GST_H264_SEI_REGISTERED_USER_DATA:
       res = gst_h264_parser_parse_registered_user_data (nalparser,
-          &sei->payload.registered_user_data, nr, payload_size);
+          &sei->payload.registered_user_data, nr, payload_size >> 3);
       break;
     case GST_H264_SEI_RECOVERY_POINT:
       res = gst_h264_parser_parse_recovery_point (nalparser,
diff --git a/gst-libs/gst/codecparsers/gsth264parser.h b/gst-libs/gst/codecparsers/gsth264parser.h
index 93078ebfea..379754453c 100644
--- a/gst-libs/gst/codecparsers/gsth264parser.h
+++ b/gst-libs/gst/codecparsers/gsth264parser.h
@@ -1030,6 +1030,18 @@ struct _GstH264PicTiming
   GstH264ClockTimestamp clock_timestamp[3];
 };
 
+/**
+ * GstH264RegisteredUserData:
+ * The User data registered by Rec. ITU-T T.35 SEI messag.
+ * @country_code: an itu_t_t35_country_code.
+ * @country_code_extension: an itu_t_t35_country_code_extension_byte.
+ *   Should be ignored when @country_code is not 0xff
+ * @data: the data of itu_t_t35_payload_byte
+ *   excluding @country_code and @country_code_extension
+ * @size: the size of @data in bytes
+ *
+ * Since: 1.16
+ */
 struct _GstH264RegisteredUserData
 {
   guint8 country_code;