summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Schmidt <thaytan@mad.scientist.com>2007-06-12 19:35:08 +0000
committerJan Schmidt <thaytan@mad.scientist.com>2007-06-12 19:35:08 +0000
commit98ef159bd144b4c50e5c5bad59abc4c180ff1e79 (patch)
tree865e8f1ce41de73fb30101c03a93c671355b7c66
parentca57eb55af83a0ca6393b15579d917046a908519 (diff)
Move qtdemux from -bad.
Original commit message from CVS: * configure.ac: * 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.args: * docs/plugins/inspect/plugin-qtdemux.xml: * docs/plugins/inspect/plugin-quicktime.xml: * win32/MANIFEST: Move qtdemux from -bad. * gst-plugins-good.spec.in: Update spec file to reflect moving of qtdemux and wavpack
-rw-r--r--ChangeLog15
-rw-r--r--configure.ac6
-rw-r--r--docs/plugins/Makefile.am1
-rw-r--r--docs/plugins/gst-plugins-good-plugins-docs.sgml2
-rw-r--r--docs/plugins/gst-plugins-good-plugins-sections.txt8
-rw-r--r--docs/plugins/gst-plugins-good-plugins.args22
-rw-r--r--docs/plugins/inspect/plugin-quicktime.xml (renamed from docs/plugins/inspect/plugin-qtdemux.xml)17
-rw-r--r--gst-plugins-good.spec.in5
-rw-r--r--win32/MANIFEST1
9 files changed, 59 insertions, 18 deletions
diff --git a/ChangeLog b/ChangeLog
index f4f7d47f..3d32cc91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,19 @@
2007-06-12 Jan Schmidt <thaytan@mad.scientist.com>
+
+ * configure.ac:
+ * 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.args:
+ * docs/plugins/inspect/plugin-qtdemux.xml:
+ * docs/plugins/inspect/plugin-quicktime.xml:
+ * win32/MANIFEST:
+ Move qtdemux from -bad.
+
+ * gst-plugins-good.spec.in:
+ Update spec file to reflect moving of qtdemux and wavpack
+
+2007-06-12 Jan Schmidt <thaytan@mad.scientist.com>
* win32/MANIFEST:
* docs/plugins/Makefile.am:
diff --git a/configure.ac b/configure.ac
index 5eb1f6b3..e4e8fd8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -98,6 +98,7 @@ GST_PLUGINS_ALL="\
matroska \
monoscope \
multipart \
+ qtdemux \
rtp \
rtsp \
smpte \
@@ -886,9 +887,9 @@ AG_GST_CHECK_FEATURE(WAVPACK, [wavpack plug-in], wavpack, [
AC_SUBST(WAVPACK_LIBS)
])
-dnl *** id3demux prefers to have zlib ***
+dnl *** qtdemux & id3demux prefer to have zlib ***
translit(dnm, m, l) AM_CONDITIONAL(USE_ZLIB, true)
-AG_GST_CHECK_FEATURE(ZLIB, [zlib support for id3demux],, [
+AG_GST_CHECK_FEATURE(ZLIB, [zlib support for id3demux/qtdemux],, [
AG_GST_CHECK_LIBHEADER(ZLIB,
z, uncompress,, zlib.h, [
HAVE_ZLIB="yes"
@@ -999,6 +1000,7 @@ gst/level/Makefile
gst/matroska/Makefile
gst/monoscope/Makefile
gst/multipart/Makefile
+gst/qtdemux/Makefile
gst/rtp/Makefile
gst/rtsp/Makefile
gst/smpte/Makefile
diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index 7120c427..2941dafa 100644
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -111,6 +111,7 @@ EXTRA_HFILES = \
$(top_srcdir)/gst/level/gstlevel.h \
$(top_srcdir)/gst/multipart/multipartdemux.c \
$(top_srcdir)/gst/multipart/multipartmux.c \
+ $(top_srcdir)/gst/qtdemux/qtdemux.h \
$(top_srcdir)/gst/rtsp/gstrtpdec.h \
$(top_srcdir)/gst/rtsp/gstrtspsrc.h \
$(top_srcdir)/gst/udp/gstmultiudpsink.h \
diff --git a/docs/plugins/gst-plugins-good-plugins-docs.sgml b/docs/plugins/gst-plugins-good-plugins-docs.sgml
index f47a57d3..dd09540f 100644
--- a/docs/plugins/gst-plugins-good-plugins-docs.sgml
+++ b/docs/plugins/gst-plugins-good-plugins-docs.sgml
@@ -51,6 +51,7 @@
<xi:include href="xml/element-osxaudiosink.xml" />
<xi:include href="xml/element-osxaudiosrc.xml" />
<xi:include href="xml/element-progressreport.xml" />
+ <xi:include href="xml/element-qtdemux.xml" />
<xi:include href="xml/element-rtspsrc.xml" />
<xi:include href="xml/element-rtpdec.xml" />
<xi:include href="xml/element-smokedec.xml" />
@@ -108,6 +109,7 @@
<xi:include href="xml/plugin-ossaudio.xml" />
<xi:include href="xml/plugin-osxaudio.xml" />
<xi:include href="xml/plugin-png.xml" />
+ <xi:include href="xml/plugin-quicktime.xml" />
<xi:include href="xml/plugin-rtp.xml" />
<xi:include href="xml/plugin-rtsp.xml" />
<xi:include href="xml/plugin-shout2send.xml" />
diff --git a/docs/plugins/gst-plugins-good-plugins-sections.txt b/docs/plugins/gst-plugins-good-plugins-sections.txt
index 0cd07c50..54c31d9e 100644
--- a/docs/plugins/gst-plugins-good-plugins-sections.txt
+++ b/docs/plugins/gst-plugins-good-plugins-sections.txt
@@ -522,6 +522,14 @@ gst_progress_report_get_type
</SECTION>
<SECTION>
+<FILE>element-qtdemux</FILE>
+GstQTDemux
+<TITLE>qtdemux</TITLE>
+<SUBSECTION Standard>
+GstQTDemuxClass
+</SECTION>
+
+<SECTION>
<FILE>element-rtspsrc</FILE>
RTSPLowerTrans
GstRTSPSrc
diff --git a/docs/plugins/gst-plugins-good-plugins.args b/docs/plugins/gst-plugins-good-plugins.args
index 4ec4ac1d..1b069bd1 100644
--- a/docs/plugins/gst-plugins-good-plugins.args
+++ b/docs/plugins/gst-plugins-good-plugins.args
@@ -161,7 +161,7 @@
<ARG>
<NAME>GstUDPSrc::sockfd</NAME>
<TYPE>gint</TYPE>
-<RANGE>>= -1</RANGE>
+<RANGE>>= G_MAXULONG</RANGE>
<FLAGS>rw</FLAGS>
<NICK>Socket Handle</NICK>
<BLURB>Socket to use for UDP reception. (-1 == allocate).</BLURB>
@@ -1141,7 +1141,7 @@
<ARG>
<NAME>GstDV1394Src::port</NAME>
<TYPE>gint</TYPE>
-<RANGE>[-1,16]</RANGE>
+<RANGE>[G_MAXULONG,16]</RANGE>
<FLAGS>rw</FLAGS>
<NICK>Port</NICK>
<BLURB>Port number (-1 automatic).</BLURB>
@@ -1341,7 +1341,7 @@
<ARG>
<NAME>GstTest::allowed-timestamp-deviation</NAME>
<TYPE>gint64</TYPE>
-<RANGE>>= -1</RANGE>
+<RANGE>>= G_MAXULONG</RANGE>
<FLAGS>rwx</FLAGS>
<NICK>allowed timestamp deviation</NICK>
<BLURB>allowed average difference in usec between timestamp of next buffer and expected timestamp from analyzing last buffer.</BLURB>
@@ -1351,7 +1351,7 @@
<ARG>
<NAME>GstTest::buffer-count</NAME>
<TYPE>gint64</TYPE>
-<RANGE>>= -1</RANGE>
+<RANGE>>= G_MAXULONG</RANGE>
<FLAGS>r</FLAGS>
<NICK>buffer count</NICK>
<BLURB>number of buffers in stream.</BLURB>
@@ -1361,7 +1361,7 @@
<ARG>
<NAME>GstTest::expected-buffer-count</NAME>
<TYPE>gint64</TYPE>
-<RANGE>>= -1</RANGE>
+<RANGE>>= G_MAXULONG</RANGE>
<FLAGS>rwx</FLAGS>
<NICK>expected buffer count</NICK>
<BLURB>expected number of buffers in stream.</BLURB>
@@ -1371,7 +1371,7 @@
<ARG>
<NAME>GstTest::expected-length</NAME>
<TYPE>gint64</TYPE>
-<RANGE>>= -1</RANGE>
+<RANGE>>= G_MAXULONG</RANGE>
<FLAGS>rwx</FLAGS>
<NICK>expected length</NICK>
<BLURB>expected length of stream.</BLURB>
@@ -1391,7 +1391,7 @@
<ARG>
<NAME>GstTest::length</NAME>
<TYPE>gint64</TYPE>
-<RANGE>>= -1</RANGE>
+<RANGE>>= G_MAXULONG</RANGE>
<FLAGS>r</FLAGS>
<NICK>length</NICK>
<BLURB>length of stream.</BLURB>
@@ -1411,7 +1411,7 @@
<ARG>
<NAME>GstTest::timestamp-deviation</NAME>
<TYPE>gint64</TYPE>
-<RANGE>>= -1</RANGE>
+<RANGE>>= G_MAXULONG</RANGE>
<FLAGS>r</FLAGS>
<NICK>timestamp deviation</NICK>
<BLURB>average difference in usec between timestamp of next buffer and expected timestamp from analyzing last buffer.</BLURB>
@@ -1481,7 +1481,7 @@
<ARG>
<NAME>GstBreakMyData::set-to</NAME>
<TYPE>gint</TYPE>
-<RANGE>[-1,255]</RANGE>
+<RANGE>[G_MAXULONG,255]</RANGE>
<FLAGS>rwx</FLAGS>
<NICK>set-to</NICK>
<BLURB>set changed bytes to this value (-1 means random value.</BLURB>
@@ -1801,7 +1801,7 @@
<ARG>
<NAME>GstDynUDPSink::sockfd</NAME>
<TYPE>gint</TYPE>
-<RANGE>[-1,32767]</RANGE>
+<RANGE>[G_MAXULONG,32767]</RANGE>
<FLAGS>rw</FLAGS>
<NICK>socket handle</NICK>
<BLURB>Socket to use for UDP sending. (-1 == allocate).</BLURB>
@@ -1821,7 +1821,7 @@
<ARG>
<NAME>GstCdioCddaSrc::read-speed</NAME>
<TYPE>gint</TYPE>
-<RANGE>[-1,100]</RANGE>
+<RANGE>[G_MAXULONG,100]</RANGE>
<FLAGS>rw</FLAGS>
<NICK>Read speed</NICK>
<BLURB>Read from device at the specified speed (-1 = default).</BLURB>
diff --git a/docs/plugins/inspect/plugin-qtdemux.xml b/docs/plugins/inspect/plugin-quicktime.xml
index b3a023dc..0cce5ad0 100644
--- a/docs/plugins/inspect/plugin-qtdemux.xml
+++ b/docs/plugins/inspect/plugin-quicktime.xml
@@ -1,12 +1,12 @@
<plugin>
- <name>qtdemux</name>
- <description>Quicktime stream demuxer</description>
+ <name>quicktime</name>
+ <description>Quicktime support</description>
<filename>../../gst/qtdemux/.libs/libgstqtdemux.so</filename>
<basename>libgstqtdemux.so</basename>
- <version>0.10.4</version>
+ <version>0.10.5.1</version>
<license>LGPL</license>
- <source>gst-plugins-bad</source>
- <package>GStreamer Bad Plug-ins source release</package>
+ <source>gst-plugins-good</source>
+ <package>GStreamer Good Plug-ins CVS/prerelease</package>
<origin>Unknown package origin</origin>
<elements>
<element>
@@ -16,5 +16,12 @@
<description>Demultiplex a QuickTime file into audio and video streams</description>
<author>David Schleef &lt;ds@schleef.org&gt;, Wim Taymans &lt;wim@fluendo.com&gt;</author>
</element>
+ <element>
+ <name>rtpxqtdepay</name>
+ <longname>RTP packet depayloader</longname>
+ <class>Codec/Depayloader/Network</class>
+ <description>Extracts Quicktime audio/video from RTP packets</description>
+ <author>Wim Taymans &lt;wim@fluendo.com&gt;</author>
+ </element>
</elements>
</plugin> \ No newline at end of file
diff --git a/gst-plugins-good.spec.in b/gst-plugins-good.spec.in
index b7c45909..adb1f002 100644
--- a/gst-plugins-good.spec.in
+++ b/gst-plugins-good.spec.in
@@ -95,6 +95,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/gstreamer-%{majorminor}/libgstlevel.so
%{_libdir}/gstreamer-%{majorminor}/libgstefence.so
%{_libdir}/gstreamer-%{majorminor}/libgstmulaw.so
+%{_libdir}/gstreamer-%{majorminor}/libgstqtdemux.so
%{_libdir}/gstreamer-%{majorminor}/libgstrtp.so
%{_libdir}/gstreamer-%{majorminor}/libgstrtsp.so
%{_libdir}/gstreamer-%{majorminor}/libgstsmpte.so
@@ -145,11 +146,15 @@ rm -rf $RPM_BUILD_ROOT
@USE_AALIB_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstaasink.so
@USE_LIBDV_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstdv.so
@USE_DV1394_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgst1394.so
+@USE_WAVPACK_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstwavpack.so
# schema files
@USE_GCONF_TRUE@%{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas
%changelog
+* Tue Jun 12 2007 Jan Schmidt <jan at fluendo dot com>
+- wavpack and qtdemux have moved from bad
+
* Fri Sep 02 2005 Thomas Vander Stichele <thomas at apestaart dot org>
- clean up for splitup
diff --git a/win32/MANIFEST b/win32/MANIFEST
index 944e6dbe..4ae3a65d 100644
--- a/win32/MANIFEST
+++ b/win32/MANIFEST
@@ -27,6 +27,7 @@ win32/vs6/libgstmedian.dsp
win32/vs6/libgstmonoscope.dsp
win32/vs6/libgstmulaw.dsp
win32/vs6/libgstmultipart.dsp
+win32/vs6/libgstqtdemux.dsp
win32/vs6/libgstrtp.dsp
win32/vs6/libgstrtsp.dsp
win32/vs6/libgstsmpte.dsp