diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2011-11-26 19:44:23 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2011-11-26 19:44:23 +0000 |
| commit | 2d7f9cfe92de5fe8faa767d9261d3adb55c7f5e2 (patch) | |
| tree | 30cd597de8ce2267f9f99c1cccbdafb9caacd8a0 /gst/gstbufferlist.h | |
| parent | c3a30e3013ddd19d6c54609921f176dfb571b283 (diff) | |
| parent | 4d2cb748509a1c7061908b10310e13b8b9ed7e7a (diff) | |
Merge remote-tracking branch 'origin/master' into 0.11
Conflicts:
gst/gstbuffer.h
gst/gstbufferlist.h
gst/gstcaps.h
gst/gstdatetime.h
gst/gstelementfactory.h
gst/gstevent.h
gst/gstghostpad.h
gst/gstindexfactory.h
gst/gstiterator.h
gst/gstmessage.h
gst/gstminiobject.h
gst/gstpipeline.h
gst/gstquery.h
gst/gstsegment.h
gst/gststructure.h
gst/gsttaglist.h
gst/gsturi.h
gst/gstvalue.h
libs/gst/base/gstbitreader.h
libs/gst/base/gstbytereader.h
libs/gst/base/gstbytewriter.h
Note: can't use G_GNUC_MALLOC with GstCaps return
values in 0.11 because of the EMPTY+ANY singletons.
Diffstat (limited to 'gst/gstbufferlist.h')
| -rw-r--r-- | gst/gstbufferlist.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gst/gstbufferlist.h b/gst/gstbufferlist.h index d160b04ba9..3aed60b9d0 100644 --- a/gst/gstbufferlist.h +++ b/gst/gstbufferlist.h @@ -156,8 +156,8 @@ gst_buffer_list_copy (const GstBufferList * list) GType gst_buffer_list_get_type (void); /* allocation */ -GstBufferList * gst_buffer_list_new (void); -GstBufferList * gst_buffer_list_new_sized (guint size); +GstBufferList * gst_buffer_list_new (void) G_GNUC_MALLOC; +GstBufferList * gst_buffer_list_new_sized (guint size) G_GNUC_MALLOC; guint gst_buffer_list_length (GstBufferList *list); |