From 7fb5bcfdffb6695bedbad88dd9e39a07f46d863c Mon Sep 17 00:00:00 2001 From: jim thornton Date: Tue, 2 Apr 2002 16:33:21 +0000 Subject: [PATCH] Buffer flag symbols are enum values, so |'ing together doesn't do the right thing, must use GST_BUFFER_FLAG_SET macro Original commit message from CVS: patch from jim thornton : Buffer flag symbols are enum values, so |'ing together doesn't do the right thing, must use GST_BUFFER_FLAG_SET macro --- common | 2 +- gst/elements/gstfilesrc.c | 3 ++- plugins/elements/gstfilesrc.c | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/common b/common index 38267ab..6148068 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 da40902..4285ed2 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 da40902..4285ed2 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; -- 2.7.4