diff --git a/gst/gstbuffer.c b/gst/gstbuffer.c
index af5e9c074c..b9e8069d76 100644
--- a/gst/gstbuffer.c
+++ b/gst/gstbuffer.c
@@ -220,7 +220,7 @@ gst_buffer_new_and_alloc (guint size)
  */
 GstBuffer*
 gst_buffer_new_from_pool (GstBufferPool *pool, 
-		          gint64 offset, guint size)
+		          guint64 offset, guint size)
 {
   GstBuffer *buffer;
   
diff --git a/gst/gstbuffer.h b/gst/gstbuffer.h
index 35026178b3..58660a209f 100644
--- a/gst/gstbuffer.h
+++ b/gst/gstbuffer.h
@@ -93,7 +93,7 @@ struct _GstBuffer {
 
 /* bufferpools */
 
-typedef GstBuffer*	(*GstBufferPoolBufferNewFunction)	(GstBufferPool *pool, gint64 offset, 
+typedef GstBuffer*	(*GstBufferPoolBufferNewFunction)	(GstBufferPool *pool, guint64 offset, 
 								 guint size, gpointer user_data);
 typedef GstBuffer* 	(*GstBufferPoolBufferCopyFunction)	(GstBufferPool *pool, 
 								 const GstBuffer *buffer, 
@@ -120,7 +120,7 @@ GstBuffer*	gst_buffer_new_and_alloc	(guint size);
 
 /* creating a new buffer from a pool */
 GstBuffer*	gst_buffer_new_from_pool 	(GstBufferPool *pool, 
-						 gint64 offset, guint size);
+						 guint64 offset, guint size);
 
 #define		gst_buffer_set_data(buf, data, size) 	\
 G_STMT_START { 					     	\
diff --git a/gst/gstbufferpool-default.c b/gst/gstbufferpool-default.c
index 7a07c874f0..f9caa13a38 100644
--- a/gst/gstbufferpool-default.c
+++ b/gst/gstbufferpool-default.c
@@ -29,7 +29,7 @@
  * gstbuffer.c */
 
 static GstBuffer*	_gst_buffer_pool_default_buffer_new	(GstBufferPool *pool,
-                                                                 gint64 offset, guint size,
+                                                                 guint64 offset, guint size,
                                                                  gpointer user_data);
 static void		_gst_buffer_pool_default_buffer_free	(GstBufferPool *pool,
                                                                  GstBuffer *buffer,
@@ -113,7 +113,7 @@ gst_buffer_pool_get_default (guint buffer_size, guint pool_size)
 }
 
 static GstBuffer* 
-_gst_buffer_pool_default_buffer_new (GstBufferPool *pool, gint64 offset,
+_gst_buffer_pool_default_buffer_new (GstBufferPool *pool, guint64 offset,
                                      guint size, gpointer user_data)
 {
   GstBuffer *buffer;