summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.net>2006-04-27 16:05:54 +0000
committerTim-Philipp Müller <tim@centricular.net>2006-04-27 16:05:54 +0000
commitb88deddeca5ed94c19baa5321d04447897a4840d (patch)
tree637daabe2339ef056d0eb3934159223dad98b358 /docs
parentd1cdfa6d3c0950bf95ad25697e4a38586a4eab83 (diff)
Add docs for both avidemux and avimux.
Original commit message from CVS: * 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: * docs/plugins/inspect/plugin-avi.xml: * gst/avi/gstavidemux.c: * gst/avi/gstavimux.c: Add docs for both avidemux and avimux.
Diffstat (limited to 'docs')
-rw-r--r--docs/plugins/Makefile.am2
-rw-r--r--docs/plugins/gst-plugins-good-plugins-docs.sgml2
-rw-r--r--docs/plugins/gst-plugins-good-plugins-sections.txt16
-rw-r--r--docs/plugins/gst-plugins-good-plugins.hierarchy1
-rw-r--r--docs/plugins/inspect/plugin-avi.xml7
5 files changed, 28 insertions, 0 deletions
diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index ee731364..dd73972f 100644
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -77,6 +77,8 @@ EXTRA_HFILES = \
$(top_srcdir)/gst/apetag/gstapedemux.h \
$(top_srcdir)/gst/autodetect/gstautoaudiosink.h \
$(top_srcdir)/gst/autodetect/gstautovideosink.h \
+ $(top_srcdir)/gst/avi/gstavidemux.h \
+ $(top_srcdir)/gst/avi/gstavimux.h \
$(top_srcdir)/gst/level/gstlevel.h \
$(top_srcdir)/gst/goom/gstgoom.h \
$(top_srcdir)/gst/id3demux/gstid3demux.h \
diff --git a/docs/plugins/gst-plugins-good-plugins-docs.sgml b/docs/plugins/gst-plugins-good-plugins-docs.sgml
index b4b85e18..912f627f 100644
--- a/docs/plugins/gst-plugins-good-plugins-docs.sgml
+++ b/docs/plugins/gst-plugins-good-plugins-docs.sgml
@@ -15,6 +15,8 @@
<xi:include href="xml/element-apedemux.xml" />
<xi:include href="xml/element-autoaudiosink.xml" />
<xi:include href="xml/element-autovideosink.xml" />
+ <xi:include href="xml/element-avidemux.xml" />
+ <xi:include href="xml/element-avimux.xml" />
<xi:include href="xml/element-cairotimeoverlay.xml" />
<xi:include href="xml/element-cdiocddasrc.xml" />
<xi:include href="xml/element-dvdec.xml" />
diff --git a/docs/plugins/gst-plugins-good-plugins-sections.txt b/docs/plugins/gst-plugins-good-plugins-sections.txt
index 8c7032a4..c30e4911 100644
--- a/docs/plugins/gst-plugins-good-plugins-sections.txt
+++ b/docs/plugins/gst-plugins-good-plugins-sections.txt
@@ -23,6 +23,22 @@ GstAutoVideoSinkClass
</SECTION>
<SECTION>
+<FILE>element-avidemux</FILE>
+GstAviDemux
+<TITLE>avidemux</TITLE>
+<SUBSECTION Standard>
+GstAviDemuxClass
+</SECTION>
+
+<SECTION>
+<FILE>element-avimux</FILE>
+GstAviMux
+<TITLE>avimux</TITLE>
+<SUBSECTION Standard>
+GstAviMuxClass
+</SECTION>
+
+<SECTION>
<FILE>element-cairotimeoverlay</FILE>
GstCairoTimeOverlay
<TITLE>cairotimeoverlay</TITLE>
diff --git a/docs/plugins/gst-plugins-good-plugins.hierarchy b/docs/plugins/gst-plugins-good-plugins.hierarchy
index 6210a5ec..c4566f7f 100644
--- a/docs/plugins/gst-plugins-good-plugins.hierarchy
+++ b/docs/plugins/gst-plugins-good-plugins.hierarchy
@@ -106,6 +106,7 @@ GObject
GstEFence
GstCutter
GstAviDemux
+ GstAviMux
GstAuParse
GstAlpha
GstTagDemux
diff --git a/docs/plugins/inspect/plugin-avi.xml b/docs/plugins/inspect/plugin-avi.xml
index e08b08f4..a8328845 100644
--- a/docs/plugins/inspect/plugin-avi.xml
+++ b/docs/plugins/inspect/plugin-avi.xml
@@ -18,5 +18,12 @@
Wim Taymans &lt;wim.taymans@chello.be&gt;
Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;</author>
</element>
+ <element>
+ <name>avimux</name>
+ <longname>Avi muxer</longname>
+ <class>Codec/Muxer</class>
+ <description>Muxes audio and video into an avi stream</description>
+ <author>Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;</author>
+ </element>
</elements>
</plugin> \ No newline at end of file