summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@collabora.co.uk>2011-11-04 11:01:42 +0100
committerWim Taymans <wim.taymans@collabora.co.uk>2011-11-04 11:01:42 +0100
commitf4c283a9cca01e8d994c7a94bd306f628d2868e9 (patch)
treeb68a0074230a29b8d54dd2c3c2bb0e9e83b74715 /docs
parent9f72f309f6e411fe839a3c609831a33bf2f96b21 (diff)
parent9f76573bda8013e7fa912a4f45f13a03e061bd66 (diff)
downloadgstreamer-plugins-bad-f4c283a9cca01e8d994c7a94bd306f628d2868e9.tar.gz
Merge branch 'master' into 0.11
Diffstat (limited to 'docs')
-rw-r--r--docs/libs/gst-plugins-bad-libs-docs.sgml3
-rw-r--r--docs/libs/gst-plugins-bad-libs-sections.txt42
2 files changed, 45 insertions, 0 deletions
diff --git a/docs/libs/gst-plugins-bad-libs-docs.sgml b/docs/libs/gst-plugins-bad-libs-docs.sgml
index bc648842e..0c9994160 100644
--- a/docs/libs/gst-plugins-bad-libs-docs.sgml
+++ b/docs/libs/gst-plugins-bad-libs-docs.sgml
@@ -39,6 +39,9 @@
<xi:include href="xml/gstbasevideodecoder.xml" />
<xi:include href="xml/gstbasevideoencoder.xml" />
<xi:include href="xml/gstbasevideoutils.xml" />
+ <xi:include href="xml/gstvideocontext.xml" />
+ <xi:include href="xml/gstsurfacebuffer.xml" />
+ <xi:include href="xml/gstsurfaceconverter.xml" />
</chapter>
</part>
diff --git a/docs/libs/gst-plugins-bad-libs-sections.txt b/docs/libs/gst-plugins-bad-libs-sections.txt
index bc424db1a..92e620ac5 100644
--- a/docs/libs/gst-plugins-bad-libs-sections.txt
+++ b/docs/libs/gst-plugins-bad-libs-sections.txt
@@ -404,3 +404,45 @@ gst_base_video_rawvideo_convert
gst_base_video_encoded_video_convert
gst_video_state_get_timestamp
</SECTION>
+
+<SECTION>
+<FILE>gstvideocontext</FILE>
+<TITLE>GstVideoContextInterface</TITLE>
+GST_IS_VIDEO_CONTEXT
+GstVideoContext
+GstVideoContextInterface
+gst_video_context_iface_get_type
+gst_video_context_set_context
+gst_video_context_set_context_string
+gst_video_context_set_context_pointer
+gst_video_context_set_context_object
+gst_video_context_prepare
+gst_video_context_message_parse_prepare
+gst_video_context_query_new
+gst_video_context_run_query
+gst_video_context_query_get_supported_types
+gst_video_context_query_parse_value
+gst_video_context_query_set_value
+gst_video_context_query_set_string
+gst_video_context_query_set_pointer
+gst_video_context_query_set_object
+</SECTION>
+
+<SECTION>
+<FILE>gstsurfacebuffer</FILE>
+<TITLE>GstSurfaceBuffer</TITLE>
+GST_VIDEO_CAPS_SURFACE
+GstSurfaceBuffer
+GstSurfaceBufferClass
+gst_surface_buffer_get_type
+gst_surface_buffer_create_converter
+</SECTION>
+
+<SECTION>
+<FILE>gstsurfaceconverter</FILE>
+<TITLE>GstSurfaceConverter</TITLE>
+GstSurfaceConverter
+GstSurfaceConverterInterface
+gst_surface_converter_get_type
+gst_surface_converter_upload
+</SECTION>