diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-10-28 11:13:55 +0200 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-10-28 11:13:55 +0200 |
| commit | d110c4db31a628aef84efdb374422b28f9976089 (patch) | |
| tree | 561a006afc9450ce3c36d1747f39c0ce557aa4d6 /docs/libs | |
| parent | 021f09d622a72cfe9716a332ce6c70f1fcb77531 (diff) | |
| parent | 2f100e86f6084d81a307994175c9c69834e9042e (diff) | |
Merge branch 'master' into 0.11
Diffstat (limited to 'docs/libs')
| -rw-r--r-- | docs/libs/gstreamer-libs-docs.sgml | 1 | ||||
| -rw-r--r-- | docs/libs/gstreamer-libs-sections.txt | 65 |
2 files changed, 66 insertions, 0 deletions
diff --git a/docs/libs/gstreamer-libs-docs.sgml b/docs/libs/gstreamer-libs-docs.sgml index ee1b06ba1..545019f4d 100644 --- a/docs/libs/gstreamer-libs-docs.sgml +++ b/docs/libs/gstreamer-libs-docs.sgml @@ -44,6 +44,7 @@ <xi:include href="xml/gstbytereader.xml" /> <xi:include href="xml/gstbytewriter.xml" /> <xi:include href="xml/gstcollectpads.xml" /> + <xi:include href="xml/gstcollectpads2.xml" /> <xi:include href="xml/gsttypefindhelper.xml" /> </chapter> diff --git a/docs/libs/gstreamer-libs-sections.txt b/docs/libs/gstreamer-libs-sections.txt index 94233aa88..29a792f9f 100644 --- a/docs/libs/gstreamer-libs-sections.txt +++ b/docs/libs/gstreamer-libs-sections.txt @@ -736,6 +736,71 @@ GST_COLLECT_PADS_SIGNAL GST_COLLECT_PADS_WAIT </SECTION> +<SECTION> +<FILE>gstcollectpads2</FILE> +<TITLE>GstCollectPads2</TITLE> +<INCLUDE>gst/base/gstcollectpads2.h</INCLUDE> +GstCollectPads2 +GstCollectData2 + +GstCollectData2DestroyNotify +GstCollectPads2BufferFunction +GstCollectPads2CompareFunction +GstCollectPads2EventFunction +GstCollectPads2ClipFunction +GstCollectPads2Function +GstCollectPads2StateFlags + +GST_COLLECT_PADS2_STATE +GST_COLLECT_PADS2_STATE_IS_SET +GST_COLLECT_PADS2_STATE_SET +GST_COLLECT_PADS2_STATE_UNSET + +GST_COLLECT_PADS2_GET_STREAM_LOCK +GST_COLLECT_PADS2_STREAM_LOCK +GST_COLLECT_PADS2_STREAM_UNLOCK + +gst_collect_pads2_new + +gst_collect_pads2_add_pad +gst_collect_pads2_add_pad_full +gst_collect_pads2_remove_pad + +gst_collect_pads2_start +gst_collect_pads2_stop + +gst_collect_pads2_available +gst_collect_pads2_is_active + +gst_collect_pads2_collect +gst_collect_pads2_collect_range + +gst_collect_pads2_flush +gst_collect_pads2_peek +gst_collect_pads2_pop + +gst_collect_pads2_read +gst_collect_pads2_read_buffer +gst_collect_pads2_take_buffer + +gst_collect_pads2_set_buffer_function +gst_collect_pads2_set_compare_function +gst_collect_pads2_set_event_function +gst_collect_pads2_set_clip_function +gst_collect_pads2_set_flushing +gst_collect_pads2_set_function +gst_collect_pads2_set_waiting +<SUBSECTION Standard> +GstCollectPads2Class +GST_COLLECT_PADS2 +GST_COLLECT_PADS2_CLASS +GST_TYPE_COLLECT_PADS2 +GST_IS_COLLECT_PADS2 +GST_IS_COLLECT_PADS2_CLASS +GST_COLLECT_PADS2_GET_CLASS +gst_collect_pads2_get_type +<SUBSECTION Private> +</SECTION> <SECTION> <FILE>gstpushsrc</FILE> |