diff --git a/gst-libs/gst/video/gstvideodecoder.c b/gst-libs/gst/video/gstvideodecoder.c
index e6fcb342d1..07d656ff10 100644
--- a/gst-libs/gst/video/gstvideodecoder.c
+++ b/gst-libs/gst/video/gstvideodecoder.c
@@ -372,8 +372,8 @@ struct _GstVideoDecoderPrivate
   int reorder_depth;
   int distance_from_sync;
 
-  guint64 system_frame_number;
-  guint64 decode_frame_number;
+  guint32 system_frame_number;
+  guint32 decode_frame_number;
 
   GList *frames;                /* Protected with OBJECT_LOCK */
   GstVideoCodecState *input_state;
diff --git a/gst-libs/gst/video/gstvideoencoder.c b/gst-libs/gst/video/gstvideoencoder.c
index 455215b9c2..ba91c5aa5b 100644
--- a/gst-libs/gst/video/gstvideoencoder.c
+++ b/gst-libs/gst/video/gstvideoencoder.c
@@ -153,7 +153,7 @@ struct _GstVideoEncoderPrivate
 
   GList *force_key_unit;        /* List of pending forced keyunits */
 
-  guint64 system_frame_number;
+  guint32 system_frame_number;
 
   GList *frames;                /* Protected with OBJECT_LOCK */
   GstVideoCodecState *input_state;
diff --git a/gst-libs/gst/video/gstvideoutils.h b/gst-libs/gst/video/gstvideoutils.h
index 60e27eabfc..50cb2b56fb 100644
--- a/gst-libs/gst/video/gstvideoutils.h
+++ b/gst-libs/gst/video/gstvideoutils.h
@@ -222,9 +222,9 @@ struct _GstVideoCodecFrame
   guint32 flags;
 
   /*< public >*/
-  gint system_frame_number;	/* ED */
-  gint decode_frame_number;	/* ED */
-  gint presentation_frame_number; /* ED */
+  guint32 system_frame_number;	/* ED */
+  guint32 decode_frame_number;	/* ED */
+  guint32 presentation_frame_number; /* ED */
 
   GstClockTime dts;       /* ED */
   GstClockTime pts;       /* ED */