From ea9090e73fada2f174319b901ec39c4a042992d6 Mon Sep 17 00:00:00 2001
From: Julien Moutte <julien@moutte.net>
Date: Mon, 12 Dec 2005 22:29:34 +0000
Subject: Adding documentation for videomixer on my way with a funny sample
 pipeline.

Original commit message from CVS:
2005-12-12  Julien MOUTTE  <julien@moutte.net>

* docs/plugins/Makefile.am:
* docs/plugins/gst-plugins-good-plugins-docs.sgml:
* docs/plugins/gst-plugins-good-plugins-sections.txt:
* docs/plugins/gst-plugins-good-plugins.hierarchy:
* gst/videomixer/videomixer.c:
(gst_videomixer_pad_sink_setcaps),
(gst_videomixer_getcaps), (gst_videomixer_fill_queues),
(gst_videomixer_update_queues), (gst_videomixer_collected):
Adding
documentation for videomixer on my way with a funny sample
pipeline.
---
 docs/plugins/Makefile.am                           | 3 ++-
 docs/plugins/gst-plugins-good-plugins-docs.sgml    | 1 +
 docs/plugins/gst-plugins-good-plugins-sections.txt | 9 +++++++++
 docs/plugins/gst-plugins-good-plugins.hierarchy    | 1 +
 4 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'docs/plugins')

diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index 67a90f36e..ddc806230 100644
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -81,7 +81,8 @@ EXTRA_HFILES = \
 	$(top_srcdir)/ext/cairo/gsttimeoverlay.h \
 	$(top_srcdir)/ext/flac/gstflacdec.h \
 	$(top_srcdir)/gst/multipart/multipartmux.c \
-	$(top_srcdir)/gst/multipart/multipartdemux.c
+	$(top_srcdir)/gst/multipart/multipartdemux.c \
+	$(top_srcdir)/gst/videomixer/videomixer.c
 
 # example code that needs to be converted to xml and placed in xml/
 EXAMPLE_CFILES = \
diff --git a/docs/plugins/gst-plugins-good-plugins-docs.sgml b/docs/plugins/gst-plugins-good-plugins-docs.sgml
index a6df6a46e..731225d0d 100644
--- a/docs/plugins/gst-plugins-good-plugins-docs.sgml
+++ b/docs/plugins/gst-plugins-good-plugins-docs.sgml
@@ -20,6 +20,7 @@
     <xi:include href="xml/element-level.xml" />
     <xi:include href="xml/element-multipartmux.xml" />
     <xi:include href="xml/element-multipartdemux.xml" />
+    <xi:include href="xml/element-videomixer.xml" />
   </chapter>
 
   <chapter>
diff --git a/docs/plugins/gst-plugins-good-plugins-sections.txt b/docs/plugins/gst-plugins-good-plugins-sections.txt
index 70a431c07..8cfbfd578 100644
--- a/docs/plugins/gst-plugins-good-plugins-sections.txt
+++ b/docs/plugins/gst-plugins-good-plugins-sections.txt
@@ -62,3 +62,12 @@ GstMultipartDemux
 GstMultipartDemuxClass
 </SECTION>
 
+<SECTION>
+<FILE>element-videomixer</FILE>
+GstVideoMixer
+GstVideoMixerBackground
+<TITLE>videomixer</TITLE>
+<SUBSECTION Standard>
+GstVideoMixerClass
+</SECTION>
+
diff --git a/docs/plugins/gst-plugins-good-plugins.hierarchy b/docs/plugins/gst-plugins-good-plugins.hierarchy
index e3db900e6..a1cfacce7 100644
--- a/docs/plugins/gst-plugins-good-plugins.hierarchy
+++ b/docs/plugins/gst-plugins-good-plugins.hierarchy
@@ -294,6 +294,7 @@ GObject
       GstTypeFindElement
       GstMultipartMux
       GstMultipartDemux
+      GstVideoMixer
     GstPadTemplate
     GstIndex
       GstMemIndex
-- 
cgit v1.2.3