From fd59a2cead13c3976de070781ff94b607757799e Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 23 Feb 2011 10:31:44 +0100 Subject: [PATCH] miniobject: fix flags --- gst/gstbuffer.h | 2 +- gst/gstminiobject.h | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/gst/gstbuffer.h b/gst/gstbuffer.h index 567cda30be..4ad4c9e696 100644 --- a/gst/gstbuffer.h +++ b/gst/gstbuffer.h @@ -222,7 +222,6 @@ extern GType _gst_buffer_type; */ typedef enum { GST_BUFFER_FLAG_READONLY = GST_MINI_OBJECT_FLAG_READONLY, - GST_BUFFER_FLAG_MEDIA4 = GST_MINI_OBJECT_FLAG_RESERVED1, GST_BUFFER_FLAG_PREROLL = (GST_MINI_OBJECT_FLAG_LAST << 0), GST_BUFFER_FLAG_DISCONT = (GST_MINI_OBJECT_FLAG_LAST << 1), GST_BUFFER_FLAG_IN_CAPS = (GST_MINI_OBJECT_FLAG_LAST << 2), @@ -231,6 +230,7 @@ typedef enum { GST_BUFFER_FLAG_MEDIA1 = (GST_MINI_OBJECT_FLAG_LAST << 5), GST_BUFFER_FLAG_MEDIA2 = (GST_MINI_OBJECT_FLAG_LAST << 6), GST_BUFFER_FLAG_MEDIA3 = (GST_MINI_OBJECT_FLAG_LAST << 7), + GST_BUFFER_FLAG_MEDIA4 = (GST_MINI_OBJECT_FLAG_LAST << 8), GST_BUFFER_FLAG_LAST = (GST_MINI_OBJECT_FLAG_LAST << 16) } GstBufferFlag; diff --git a/gst/gstminiobject.h b/gst/gstminiobject.h index 86cc56a8a4..faf10c4928 100644 --- a/gst/gstminiobject.h +++ b/gst/gstminiobject.h @@ -107,8 +107,6 @@ typedef void (*GstMiniObjectFreeFunction) (GstMiniObject *obj); /** * GstMiniObjectFlags: * @GST_MINI_OBJECT_FLAG_READONLY: is the miniobject readonly or writable - * @GST_MINI_OBJECT_FLAG_RESERVED1: a flag reserved for internal use e.g. as - * GST_BUFFER_FLAG_MEDIA4. Since: 0.10.33. * @GST_MINI_OBJECT_FLAG_LAST: first flag that can be used by subclasses. * * Flags for the mini object @@ -116,7 +114,6 @@ typedef void (*GstMiniObjectFreeFunction) (GstMiniObject *obj); typedef enum { GST_MINI_OBJECT_FLAG_READONLY = (1<<0), - GST_MINI_OBJECT_FLAG_RESERVED1 = (1<<1), /* padding */ GST_MINI_OBJECT_FLAG_LAST = (1<<4) } GstMiniObjectFlags;