summaryrefslogtreecommitdiff
path: root/gst/gstcaps.h
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian.droege@collabora.co.uk>2012-01-26 14:33:12 +0100
committerSebastian Dröge <sebastian.droege@collabora.co.uk>2012-01-26 14:37:02 +0100
commit5d1d7d95b29a687bc91c56b9035aa0cb5f9a4e3e (patch)
treedfc011a6bcb3361d6248592cea0af7562ed359ba /gst/gstcaps.h
parentdc4d96d54cdb80cf6f569f4493c95272c06db08c (diff)
caps: Store a pointer to GstCaps in GstStaticCaps
...instead of using hackish subclass of GstCaps, which also had some thread-safety problems.
Diffstat (limited to 'gst/gstcaps.h')
-rw-r--r--gst/gstcaps.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/gst/gstcaps.h b/gst/gstcaps.h
index 320471662..4b59c4876 100644
--- a/gst/gstcaps.h
+++ b/gst/gstcaps.h
@@ -129,8 +129,7 @@ typedef enum {
*/
#define GST_STATIC_CAPS(string) \
{ \
- /* miniobject */ { { 0, 0, 0, 0, NULL, NULL, NULL, 0, NULL }, \
- /* caps */ NULL }, \
+ /* caps */ NULL, \
/* string */ string, \
GST_PADDING_INIT \
}
@@ -361,7 +360,7 @@ struct _GstCaps {
*/
struct _GstStaticCaps {
/*< public >*/
- GstCaps caps;
+ GstCaps *caps;
const char *string;
/*< private >*/