diff --git a/common b/common
index 38267abf56..6148068f23 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 38267abf56a3428093cea71429dca6a24a927547
+Subproject commit 6148068f2318e85d8e66df485342b630d8fb49ac
diff --git a/gst/elements/gstfilesrc.c b/gst/elements/gstfilesrc.c
index da40902196..4285ed242e 100644
--- a/gst/elements/gstfilesrc.c
+++ b/gst/elements/gstfilesrc.c
@@ -362,7 +362,8 @@ gst_filesrc_map_region (GstFileSrc *src, off_t offset, size_t size)
   retval = madvise(GST_BUFFER_DATA(buf),GST_BUFFER_SIZE(buf),MADV_SEQUENTIAL);
 #endif
   /* fill in the rest of the fields */
-  GST_BUFFER_FLAGS(buf) = GST_BUFFER_READONLY | GST_BUFFER_ORIGINAL;
+  GST_BUFFER_FLAG_SET(buf) = GST_BUFFER_READONLY;
+  GST_BUFFER_FLAG_SET(buf) = GST_BUFFER_ORIGINAL;
   GST_BUFFER_SIZE(buf) = size;
   GST_BUFFER_MAXSIZE(buf) = size;
   GST_BUFFER_OFFSET(buf) = offset;
diff --git a/plugins/elements/gstfilesrc.c b/plugins/elements/gstfilesrc.c
index da40902196..4285ed242e 100644
--- a/plugins/elements/gstfilesrc.c
+++ b/plugins/elements/gstfilesrc.c
@@ -362,7 +362,8 @@ gst_filesrc_map_region (GstFileSrc *src, off_t offset, size_t size)
   retval = madvise(GST_BUFFER_DATA(buf),GST_BUFFER_SIZE(buf),MADV_SEQUENTIAL);
 #endif
   /* fill in the rest of the fields */
-  GST_BUFFER_FLAGS(buf) = GST_BUFFER_READONLY | GST_BUFFER_ORIGINAL;
+  GST_BUFFER_FLAG_SET(buf) = GST_BUFFER_READONLY;
+  GST_BUFFER_FLAG_SET(buf) = GST_BUFFER_ORIGINAL;
   GST_BUFFER_SIZE(buf) = size;
   GST_BUFFER_MAXSIZE(buf) = size;
   GST_BUFFER_OFFSET(buf) = offset;