diff --git a/ChangeLog b/ChangeLog
index ed7c29f20f..af83715547 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-08-31  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* sys/v4l/gstv4lsrc.c: (gst_v4lsrc_set_property),
+	(gst_v4lsrc_get_property):
+	  The 'timestamp-offset' property is registered as an int64, so
+	  let's use g_value_{set|get}_int64() in our setter and getter
+	  functions (makes it work and fixes warnings with gst-inspect).
+
 2005-08-30  Wim Taymans  <wim@fluendo.com>
 
 	* check/elements/audioconvert.c: (setup_audioconvert):
diff --git a/sys/v4l/gstv4lsrc.c b/sys/v4l/gstv4lsrc.c
index e5afa5245f..fcd83b145b 100644
--- a/sys/v4l/gstv4lsrc.c
+++ b/sys/v4l/gstv4lsrc.c
@@ -165,7 +165,7 @@ gst_v4lsrc_set_property (GObject * object,
       v4lsrc->copy_mode = g_value_get_boolean (value);
       break;
     case PROP_TIMESTAMP_OFFSET:
-      v4lsrc->timestamp_offset = g_value_get_int (value);
+      v4lsrc->timestamp_offset = g_value_get_int64 (value);
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -191,7 +191,7 @@ gst_v4lsrc_get_property (GObject * object,
       g_value_set_boolean (value, v4lsrc->copy_mode);
       break;
     case PROP_TIMESTAMP_OFFSET:
-      g_value_set_int (value, v4lsrc->timestamp_offset);
+      g_value_set_int64 (value, v4lsrc->timestamp_offset);
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);