diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index 1b3e05ffef..6598f4db50 100644
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -209,6 +209,8 @@ EXTRA_HFILES = \
$(top_srcdir)/gst/videofilter/gstvideoflip.h \
$(top_srcdir)/gst/videomixer/videomixer.h \
$(top_srcdir)/gst/videomixer/videomixerpad.h \
+ $(top_srcdir)/gst/videomixer/videomixer2.h \
+ $(top_srcdir)/gst/videomixer/videomixer2pad.h \
$(top_srcdir)/gst/wavenc/gstwavenc.h \
$(top_srcdir)/gst/wavparse/gstwavparse.h \
$(top_srcdir)/gst/y4m/gsty4mencode.h \
diff --git a/docs/plugins/gst-plugins-good-plugins-docs.sgml b/docs/plugins/gst-plugins-good-plugins-docs.sgml
index 0117977b53..1b7136b796 100644
--- a/docs/plugins/gst-plugins-good-plugins-docs.sgml
+++ b/docs/plugins/gst-plugins-good-plugins-docs.sgml
@@ -157,6 +157,7 @@
+
@@ -249,5 +250,6 @@
gst-plugins-good Base Classes
+
diff --git a/docs/plugins/gst-plugins-good-plugins-sections.txt b/docs/plugins/gst-plugins-good-plugins-sections.txt
index e3b825f0f7..c643d47713 100644
--- a/docs/plugins/gst-plugins-good-plugins-sections.txt
+++ b/docs/plugins/gst-plugins-good-plugins-sections.txt
@@ -1948,6 +1948,35 @@ GST_IS_VIDEO_MIXER_CLASS
gst_video_mixer_get_type
+
+gstvideomixer2pad
+GstVideoMixer2Pad
+GstVideoMixer2Pad
+
+GstVideoMixer2PadClass
+GST_VIDEO_MIXER2_PAD
+GST_VIDEO_MIXER2_PAD_CLASS
+GST_IS_VIDEO_MIXER2_PAD
+GST_IS_VIDEO_MIXER2_PAD_CLASS
+GST_TYPE_VIDEO_MIXER2_PAD
+gst_videomixer2_pad_get_type
+
+
+
+element-videomixer2
+videomixer2
+GstVideoMixer2
+GstVideoMixer2Background
+
+GstVideoMixer2Class
+GST_VIDEO_MIXER2
+GST_IS_VIDEO_MIXER2
+GST_TYPE_VIDEO_MIXER2
+GST_VIDEO_MIXER2_CLASS
+GST_IS_VIDEO_MIXER2_CLASS
+gst_videomixer2_get_type
+
+
element-v4l2src
v4l2src
diff --git a/docs/plugins/gst-plugins-good-plugins.args b/docs/plugins/gst-plugins-good-plugins.args
index b7442df83c..df3b2daf43 100644
--- a/docs/plugins/gst-plugins-good-plugins.args
+++ b/docs/plugins/gst-plugins-good-plugins.args
@@ -19708,6 +19708,16 @@
FALSE
+
+GstPulseSink::client
+gchar*
+
+rw
+Client
+The PulseAudio client name to use.
+""
+
+
GstPulseSrc::device
gchar*
@@ -20838,3 +20848,13 @@
0
+
+GstVideoMixer2::background
+GstVideoMixer2Background
+
+rw
+Background
+Background type.
+Checker pattern
+
+
diff --git a/docs/plugins/gst-plugins-good-plugins.hierarchy b/docs/plugins/gst-plugins-good-plugins.hierarchy
index 67119edb44..9eb9ea3f3a 100644
--- a/docs/plugins/gst-plugins-good-plugins.hierarchy
+++ b/docs/plugins/gst-plugins-good-plugins.hierarchy
@@ -4,8 +4,6 @@ GObject
GstCmmlTagHead
GstCmmlTagStream
GstColorBalanceChannel
- GstMixerTrack
- GstMixerOptions
GstObject
GstBus
GstClock
@@ -218,6 +216,7 @@ GObject
GstMatroskaDemux
GstMatroskaMux
GstWebMMux
+ GstMonoscope
GstMuLawDec
GstMuLawEnc
GstMultipartDemux
@@ -248,6 +247,7 @@ GObject
GstApev2Mux
GstId3v2Mux
GstVideoMixer
+ GstVideoMixer2
GstWavEnc
GstWavParse
GstWavpackDec
@@ -256,6 +256,7 @@ GObject
GstY4mEncode
GstPad
GstInterleavePad
+ GstVideoMixer2Pad
GstVideoMixerPad
GstPadTemplate
GstPlugin
diff --git a/docs/plugins/gst-plugins-good-plugins.interfaces b/docs/plugins/gst-plugins-good-plugins.interfaces
index 8d31758eee..f6f45ee82b 100644
--- a/docs/plugins/gst-plugins-good-plugins.interfaces
+++ b/docs/plugins/gst-plugins-good-plugins.interfaces
@@ -1,53 +1,54 @@
GstBin GstChildProxy
GstPipeline GstChildProxy
+GstHalAudioSink GstChildProxy
+GstHalAudioSrc GstChildProxy
GstSwitchSink GstChildProxy
GstGConfVideoSink GstChildProxy
GstGConfAudioSink GstChildProxy
GstSwitchSrc GstChildProxy
GstGConfVideoSrc GstChildProxy
GstGConfAudioSrc GstChildProxy
-GstHalAudioSink GstChildProxy
-GstHalAudioSrc GstChildProxy
+GstRTSPSrc GstChildProxy GstURIHandler
GstRtpBin GstChildProxy
+GstPushFileSrc GstChildProxy GstURIHandler
GstAutoVideoSink GstChildProxy
GstAutoVideoSrc GstChildProxy
GstAutoAudioSink GstChildProxy
GstAutoAudioSrc GstChildProxy
-GstPushFileSrc GstChildProxy GstURIHandler
-GstRTSPSrc GstChildProxy GstURIHandler
GstRgVolume GstChildProxy
GstAspectRatioCrop GstChildProxy
-GstPulseSink GstStreamVolume GstImplementsInterface GstPropertyProbe
-GstOss4Sink GstStreamVolume GstPropertyProbe
-GstV4l2Sink GstImplementsInterface GstColorBalance GstVideoOrientation GstPropertyProbe
-GstShout2send GstTagSetter
-GstUDPSink GstURIHandler
-GstDV1394Src GstURIHandler GstPropertyProbe
-GstHDV1394Src GstURIHandler GstPropertyProbe
-GstSoupHTTPSrc GstURIHandler
-GstPulseSrc GstImplementsInterface GstMixer GstPropertyProbe
-GstOssSrc GstImplementsInterface GstMixer
-GstOss4Source GstImplementsInterface GstMixer GstPropertyProbe
-GstV4l2Src GstURIHandler GstImplementsInterface GstTuner GstColorBalance GstVideoOrientation GstPropertyProbe
-GstUDPSrc GstURIHandler
-GstWavpackEnc GstPreset
-GstTagLibMux GstTagSetter
-GstId3v2Mux GstTagSetter
-GstApev2Mux GstTagSetter
-GstFlacEnc GstTagSetter GstPreset
-GstFlacTag GstTagSetter
GstVideoBalance GstImplementsInterface GstColorBalance
GstIirEqualizer GstChildProxy
GstIirEqualizerNBands GstChildProxy
GstIirEqualizer3Bands GstChildProxy GstPreset
GstIirEqualizer10Bands GstChildProxy GstPreset
+GstSoupHTTPSrc GstURIHandler
+GstPulseSrc GstImplementsInterface GstMixer GstPropertyProbe
+GstOss4Source GstImplementsInterface GstMixer GstPropertyProbe
+GstOssSrc GstImplementsInterface GstMixer
+GstDV1394Src GstURIHandler GstPropertyProbe
+GstHDV1394Src GstURIHandler GstPropertyProbe
+GstV4l2Src GstURIHandler GstImplementsInterface GstTuner GstColorBalance GstVideoOrientation GstPropertyProbe
+GstUDPSrc GstURIHandler
+GstPulseSink GstStreamVolume GstImplementsInterface GstPropertyProbe
+GstOss4Sink GstStreamVolume GstPropertyProbe
+GstV4l2Sink GstImplementsInterface GstColorBalance GstVideoOrientation GstPropertyProbe
+GstShout2send GstTagSetter
+GstUDPSink GstURIHandler
GstPulseMixer GstImplementsInterface GstMixer GstPropertyProbe
+GstTagLibMux GstTagSetter
+GstId3v2Mux GstTagSetter
+GstApev2Mux GstTagSetter
+GstFlacEnc GstTagSetter GstPreset
+GstFlacTag GstTagSetter
+GstWavpackEnc GstPreset
GstSpeexEnc GstTagSetter GstPreset
-GstOssMixerElement GstImplementsInterface GstMixer
GstOss4Mixer GstImplementsInterface GstMixer GstPropertyProbe
-GstAviMux GstTagSetter
+GstOssMixerElement GstImplementsInterface GstMixer
GstMatroskaMux GstTagSetter
GstWebMMux GstTagSetter
-GstDeinterlace GstChildProxy
-GstFlvMux GstTagSetter
GstVideoMixer GstChildProxy
+GstVideoMixer2 GstChildProxy
+GstFlvMux GstTagSetter
+GstAviMux GstTagSetter
+GstDeinterlace GstChildProxy
diff --git a/docs/plugins/gst-plugins-good-plugins.prerequisites b/docs/plugins/gst-plugins-good-plugins.prerequisites
index 7ae8876552..84e5e14c1e 100644
--- a/docs/plugins/gst-plugins-good-plugins.prerequisites
+++ b/docs/plugins/gst-plugins-good-plugins.prerequisites
@@ -1,8 +1,8 @@
GstChildProxy GstObject
-GstTagSetter GstElement
GstStreamVolume GObject
GstImplementsInterface GstElement
GstMixer GstImplementsInterface GstElement
+GstTagSetter GstElement
GstTuner GstImplementsInterface GstElement
GstColorBalance GstImplementsInterface GstElement
GstVideoOrientation GstImplementsInterface GstElement
diff --git a/docs/plugins/gst-plugins-good-plugins.types b/docs/plugins/gst-plugins-good-plugins.types
index c15b4b46d2..63f6ec1f9c 100644
--- a/docs/plugins/gst-plugins-good-plugins.types
+++ b/docs/plugins/gst-plugins-good-plugins.types
@@ -2,3 +2,4 @@
type:GstIirEqualizer
type:GstVideoMixerPad
+type:GstVideoMixer2Pad
diff --git a/docs/plugins/inspect/plugin-1394.xml b/docs/plugins/inspect/plugin-1394.xml
index f91caea2d2..3772b4c00e 100644
--- a/docs/plugins/inspect/plugin-1394.xml
+++ b/docs/plugins/inspect/plugin-1394.xml
@@ -3,10 +3,10 @@
Source for video data via IEEE1394 interface
../../ext/raw1394/.libs/libgst1394.so
libgst1394.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-aasink.xml b/docs/plugins/inspect/plugin-aasink.xml
index f70139a00f..b636b2386a 100644
--- a/docs/plugins/inspect/plugin-aasink.xml
+++ b/docs/plugins/inspect/plugin-aasink.xml
@@ -3,10 +3,10 @@
ASCII Art video sink
../../ext/aalib/.libs/libgstaasink.so
libgstaasink.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-alaw.xml b/docs/plugins/inspect/plugin-alaw.xml
index 3bf8b03ed7..bef2f7ef22 100644
--- a/docs/plugins/inspect/plugin-alaw.xml
+++ b/docs/plugins/inspect/plugin-alaw.xml
@@ -3,10 +3,10 @@
ALaw audio conversion routines
../../gst/law/.libs/libgstalaw.so
libgstalaw.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-alpha.xml b/docs/plugins/inspect/plugin-alpha.xml
index bc09610322..76ee0a286f 100644
--- a/docs/plugins/inspect/plugin-alpha.xml
+++ b/docs/plugins/inspect/plugin-alpha.xml
@@ -3,10 +3,10 @@
adds an alpha channel to video - constant or via chroma-keying
../../gst/alpha/.libs/libgstalpha.so
libgstalpha.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-alphacolor.xml b/docs/plugins/inspect/plugin-alphacolor.xml
index 5f2f6be009..fda09a4386 100644
--- a/docs/plugins/inspect/plugin-alphacolor.xml
+++ b/docs/plugins/inspect/plugin-alphacolor.xml
@@ -3,16 +3,16 @@
RGBA from/to AYUV colorspace conversion preserving the alpha channel
../../gst/alpha/.libs/libgstalphacolor.so
libgstalphacolor.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
alphacolor
Alpha color filter
- Filter/Effect/Video
+ Filter/Converter/Video
ARGB from/to AYUV colorspace conversion preserving the alpha channel
Wim Taymans <wim@fluendo.com>
diff --git a/docs/plugins/inspect/plugin-annodex.xml b/docs/plugins/inspect/plugin-annodex.xml
index bdcd2a38f8..f211367ef2 100644
--- a/docs/plugins/inspect/plugin-annodex.xml
+++ b/docs/plugins/inspect/plugin-annodex.xml
@@ -3,10 +3,10 @@
annodex stream manipulation (info about annodex: http://www.annodex.net)
../../ext/annodex/.libs/libgstannodex.so
libgstannodex.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-apetag.xml b/docs/plugins/inspect/plugin-apetag.xml
index 6798192747..442d4fa25b 100644
--- a/docs/plugins/inspect/plugin-apetag.xml
+++ b/docs/plugins/inspect/plugin-apetag.xml
@@ -3,10 +3,10 @@
APEv1/2 tag reader
../../gst/apetag/.libs/libgstapetag.so
libgstapetag.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-audiofx.xml b/docs/plugins/inspect/plugin-audiofx.xml
index 6c401bb36a..2a55811a74 100644
--- a/docs/plugins/inspect/plugin-audiofx.xml
+++ b/docs/plugins/inspect/plugin-audiofx.xml
@@ -3,10 +3,10 @@
Audio effects plugin
../../gst/audiofx/.libs/libgstaudiofx.so
libgstaudiofx.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-auparse.xml b/docs/plugins/inspect/plugin-auparse.xml
index 0a1081951c..43eaf79506 100644
--- a/docs/plugins/inspect/plugin-auparse.xml
+++ b/docs/plugins/inspect/plugin-auparse.xml
@@ -3,10 +3,10 @@
parses au streams
../../gst/auparse/.libs/libgstauparse.so
libgstauparse.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-autodetect.xml b/docs/plugins/inspect/plugin-autodetect.xml
index 1f768db453..d2fb21de5f 100644
--- a/docs/plugins/inspect/plugin-autodetect.xml
+++ b/docs/plugins/inspect/plugin-autodetect.xml
@@ -3,10 +3,10 @@
Plugin contains auto-detection plugins for video/audio in- and outputs
../../gst/autodetect/.libs/libgstautodetect.so
libgstautodetect.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-avi.xml b/docs/plugins/inspect/plugin-avi.xml
index a49dfe612b..89cd9910cd 100644
--- a/docs/plugins/inspect/plugin-avi.xml
+++ b/docs/plugins/inspect/plugin-avi.xml
@@ -3,10 +3,10 @@
AVI stream handling
../../gst/avi/.libs/libgstavi.so
libgstavi.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-cacasink.xml b/docs/plugins/inspect/plugin-cacasink.xml
index 247c51c855..749332c36d 100644
--- a/docs/plugins/inspect/plugin-cacasink.xml
+++ b/docs/plugins/inspect/plugin-cacasink.xml
@@ -3,10 +3,10 @@
Colored ASCII Art video sink
../../ext/libcaca/.libs/libgstcacasink.so
libgstcacasink.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-cairo.xml b/docs/plugins/inspect/plugin-cairo.xml
index 6b1daa54de..e192b56b7b 100644
--- a/docs/plugins/inspect/plugin-cairo.xml
+++ b/docs/plugins/inspect/plugin-cairo.xml
@@ -3,10 +3,10 @@
Cairo-based elements
../../ext/cairo/.libs/libgstcairo.so
libgstcairo.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-cutter.xml b/docs/plugins/inspect/plugin-cutter.xml
index b638925c05..e38f4f1fe0 100644
--- a/docs/plugins/inspect/plugin-cutter.xml
+++ b/docs/plugins/inspect/plugin-cutter.xml
@@ -3,10 +3,10 @@
Audio Cutter to split audio into non-silent bits
../../gst/cutter/.libs/libgstcutter.so
libgstcutter.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-debug.xml b/docs/plugins/inspect/plugin-debug.xml
index 7ac697668e..c4bbb03507 100644
--- a/docs/plugins/inspect/plugin-debug.xml
+++ b/docs/plugins/inspect/plugin-debug.xml
@@ -3,10 +3,10 @@
elements for testing and debugging
../../gst/debugutils/.libs/libgstdebug.so
libgstdebug.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-deinterlace.xml b/docs/plugins/inspect/plugin-deinterlace.xml
index 558cf52443..4a84875187 100644
--- a/docs/plugins/inspect/plugin-deinterlace.xml
+++ b/docs/plugins/inspect/plugin-deinterlace.xml
@@ -3,10 +3,10 @@
Deinterlacer
../../gst/deinterlace/.libs/libgstdeinterlace.so
libgstdeinterlace.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-dv.xml b/docs/plugins/inspect/plugin-dv.xml
index ae545a9d70..7335e94758 100644
--- a/docs/plugins/inspect/plugin-dv.xml
+++ b/docs/plugins/inspect/plugin-dv.xml
@@ -3,10 +3,10 @@
DV demuxer and decoder based on libdv (libdv.sf.net)
../../ext/dv/.libs/libgstdv.so
libgstdv.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-efence.xml b/docs/plugins/inspect/plugin-efence.xml
index a06833e45f..2506ff43fb 100644
--- a/docs/plugins/inspect/plugin-efence.xml
+++ b/docs/plugins/inspect/plugin-efence.xml
@@ -3,10 +3,10 @@
This element converts a stream of normal GStreamer buffers into a stream of buffers that are allocated in such a way that out-of-bounds access to data in the buffer is more likely to cause segmentation faults. This allocation method is very similar to the debugging tool "Electric Fence".
../../gst/debugutils/.libs/libgstefence.so
libgstefence.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-effectv.xml b/docs/plugins/inspect/plugin-effectv.xml
index d783b5e7ba..d9160366f8 100644
--- a/docs/plugins/inspect/plugin-effectv.xml
+++ b/docs/plugins/inspect/plugin-effectv.xml
@@ -3,10 +3,10 @@
effect plugins from the effectv project
../../gst/effectv/.libs/libgsteffectv.so
libgsteffectv.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-equalizer.xml b/docs/plugins/inspect/plugin-equalizer.xml
index c8b9aef187..86665c0d8d 100644
--- a/docs/plugins/inspect/plugin-equalizer.xml
+++ b/docs/plugins/inspect/plugin-equalizer.xml
@@ -3,10 +3,10 @@
GStreamer audio equalizers
../../gst/equalizer/.libs/libgstequalizer.so
libgstequalizer.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-esdsink.xml b/docs/plugins/inspect/plugin-esdsink.xml
index 1ec21395f9..901a6df65c 100644
--- a/docs/plugins/inspect/plugin-esdsink.xml
+++ b/docs/plugins/inspect/plugin-esdsink.xml
@@ -3,10 +3,10 @@
ESD Element Plugins
../../ext/esd/.libs/libgstesd.so
libgstesd.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-flac.xml b/docs/plugins/inspect/plugin-flac.xml
index 534b8d9396..d1cbb9c739 100644
--- a/docs/plugins/inspect/plugin-flac.xml
+++ b/docs/plugins/inspect/plugin-flac.xml
@@ -3,10 +3,10 @@
The FLAC Lossless compressor Codec
../../ext/flac/.libs/libgstflac.so
libgstflac.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-flv.xml b/docs/plugins/inspect/plugin-flv.xml
index fb45ea887b..f2485de575 100644
--- a/docs/plugins/inspect/plugin-flv.xml
+++ b/docs/plugins/inspect/plugin-flv.xml
@@ -3,10 +3,10 @@
FLV muxing and demuxing plugin
../../gst/flv/.libs/libgstflv.so
libgstflv.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-flxdec.xml b/docs/plugins/inspect/plugin-flxdec.xml
index 451f67e697..15a4fc5fa7 100644
--- a/docs/plugins/inspect/plugin-flxdec.xml
+++ b/docs/plugins/inspect/plugin-flxdec.xml
@@ -3,10 +3,10 @@
FLC/FLI/FLX video decoder
../../gst/flx/.libs/libgstflxdec.so
libgstflxdec.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-gconfelements.xml b/docs/plugins/inspect/plugin-gconfelements.xml
index e361b2e944..85d25ea559 100644
--- a/docs/plugins/inspect/plugin-gconfelements.xml
+++ b/docs/plugins/inspect/plugin-gconfelements.xml
@@ -3,10 +3,10 @@
elements wrapping the GStreamer/GConf audio/video output settings
../../ext/gconf/.libs/libgstgconfelements.so
libgstgconfelements.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-gdkpixbuf.xml b/docs/plugins/inspect/plugin-gdkpixbuf.xml
index 0d28e0d4fe..fc04223d9f 100644
--- a/docs/plugins/inspect/plugin-gdkpixbuf.xml
+++ b/docs/plugins/inspect/plugin-gdkpixbuf.xml
@@ -3,10 +3,10 @@
GdkPixbuf-based image decoder, scaler and sink
../../ext/gdk_pixbuf/.libs/libgstgdkpixbuf.so
libgstgdkpixbuf.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-gdkpixbuf3.xml b/docs/plugins/inspect/plugin-gdkpixbuf3.xml
new file mode 100644
index 0000000000..3a7dbfcbaf
--- /dev/null
+++ b/docs/plugins/inspect/plugin-gdkpixbuf3.xml
@@ -0,0 +1,13 @@
+
+ gdkpixbuf3
+ GdkPixbuf-based image decoder, scaler and sink
+ ../../ext/gdk_pixbuf/.libs/libgstgdkpixbuf3.so
+ libgstgdkpixbuf3.so
+ 0.10.23.3
+ LGPL
+ gst-plugins-good
+ GStreamer Good Plug-ins prerelease
+ Unknown package origin
+
+
+
\ No newline at end of file
diff --git a/docs/plugins/inspect/plugin-goom.xml b/docs/plugins/inspect/plugin-goom.xml
index ad781b0898..ac3fd969d5 100644
--- a/docs/plugins/inspect/plugin-goom.xml
+++ b/docs/plugins/inspect/plugin-goom.xml
@@ -3,10 +3,10 @@
GOOM visualization filter
../../gst/goom/.libs/libgstgoom.so
libgstgoom.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-goom2k1.xml b/docs/plugins/inspect/plugin-goom2k1.xml
index 894d7d7a41..12b441a3b2 100644
--- a/docs/plugins/inspect/plugin-goom2k1.xml
+++ b/docs/plugins/inspect/plugin-goom2k1.xml
@@ -3,10 +3,10 @@
GOOM 2k1 visualization filter
../../gst/goom2k1/.libs/libgstgoom2k1.so
libgstgoom2k1.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-gstrtpmanager.xml b/docs/plugins/inspect/plugin-gstrtpmanager.xml
index f4a1d9e35f..760a7db4ae 100644
--- a/docs/plugins/inspect/plugin-gstrtpmanager.xml
+++ b/docs/plugins/inspect/plugin-gstrtpmanager.xml
@@ -3,10 +3,10 @@
RTP session management plugin library
../../gst/rtpmanager/.libs/libgstrtpmanager.so
libgstrtpmanager.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-halelements.xml b/docs/plugins/inspect/plugin-halelements.xml
index aa5cfae472..e09102a615 100644
--- a/docs/plugins/inspect/plugin-halelements.xml
+++ b/docs/plugins/inspect/plugin-halelements.xml
@@ -3,10 +3,10 @@
elements wrapping the GStreamer/HAL audio input/output devices
../../ext/hal/.libs/libgsthalelements.so
libgsthalelements.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-icydemux.xml b/docs/plugins/inspect/plugin-icydemux.xml
index 1049e70cc4..575f8e69db 100644
--- a/docs/plugins/inspect/plugin-icydemux.xml
+++ b/docs/plugins/inspect/plugin-icydemux.xml
@@ -3,10 +3,10 @@
Demux ICY tags from a stream
../../gst/icydemux/.libs/libgsticydemux.so
libgsticydemux.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-id3demux.xml b/docs/plugins/inspect/plugin-id3demux.xml
index 030226a8f5..0594393dba 100644
--- a/docs/plugins/inspect/plugin-id3demux.xml
+++ b/docs/plugins/inspect/plugin-id3demux.xml
@@ -3,10 +3,10 @@
Demux ID3v1 and ID3v2 tags from a file
../../gst/id3demux/.libs/libgstid3demux.so
libgstid3demux.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-imagefreeze.xml b/docs/plugins/inspect/plugin-imagefreeze.xml
index abffbcbb90..ea32832e92 100644
--- a/docs/plugins/inspect/plugin-imagefreeze.xml
+++ b/docs/plugins/inspect/plugin-imagefreeze.xml
@@ -3,10 +3,10 @@
Still frame stream generator
../../gst/imagefreeze/.libs/libgstimagefreeze.so
libgstimagefreeze.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-interleave.xml b/docs/plugins/inspect/plugin-interleave.xml
index 57e4dff3f7..34bbae1b22 100644
--- a/docs/plugins/inspect/plugin-interleave.xml
+++ b/docs/plugins/inspect/plugin-interleave.xml
@@ -3,10 +3,10 @@
Audio interleaver/deinterleaver
../../gst/interleave/.libs/libgstinterleave.so
libgstinterleave.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-jpeg.xml b/docs/plugins/inspect/plugin-jpeg.xml
index e15962a9d1..ca6e65d09c 100644
--- a/docs/plugins/inspect/plugin-jpeg.xml
+++ b/docs/plugins/inspect/plugin-jpeg.xml
@@ -3,10 +3,10 @@
JPeg plugin library
../../ext/jpeg/.libs/libgstjpeg.so
libgstjpeg.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-level.xml b/docs/plugins/inspect/plugin-level.xml
index 947da1403c..86f8b33602 100644
--- a/docs/plugins/inspect/plugin-level.xml
+++ b/docs/plugins/inspect/plugin-level.xml
@@ -3,10 +3,10 @@
Audio level plugin
../../gst/level/.libs/libgstlevel.so
libgstlevel.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-matroska.xml b/docs/plugins/inspect/plugin-matroska.xml
index 2479e1db2b..6141a5caca 100644
--- a/docs/plugins/inspect/plugin-matroska.xml
+++ b/docs/plugins/inspect/plugin-matroska.xml
@@ -3,10 +3,10 @@
Matroska and WebM stream handling
../../gst/matroska/.libs/libgstmatroska.so
libgstmatroska.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-monoscope.xml b/docs/plugins/inspect/plugin-monoscope.xml
index 4a97ed02a4..8d6951fdd4 100644
--- a/docs/plugins/inspect/plugin-monoscope.xml
+++ b/docs/plugins/inspect/plugin-monoscope.xml
@@ -3,10 +3,10 @@
Monoscope visualization
../../gst/monoscope/.libs/libgstmonoscope.so
libgstmonoscope.so
- 0.10.22.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-mulaw.xml b/docs/plugins/inspect/plugin-mulaw.xml
index 43ed943a04..be317af27a 100644
--- a/docs/plugins/inspect/plugin-mulaw.xml
+++ b/docs/plugins/inspect/plugin-mulaw.xml
@@ -3,10 +3,10 @@
MuLaw audio conversion routines
../../gst/law/.libs/libgstmulaw.so
libgstmulaw.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-multifile.xml b/docs/plugins/inspect/plugin-multifile.xml
index 68f7f3bdac..4610c1a149 100644
--- a/docs/plugins/inspect/plugin-multifile.xml
+++ b/docs/plugins/inspect/plugin-multifile.xml
@@ -3,10 +3,10 @@
Reads/Writes buffers from/to sequentially named files
../../gst/multifile/.libs/libgstmultifile.so
libgstmultifile.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-multipart.xml b/docs/plugins/inspect/plugin-multipart.xml
index ec9772afcb..49be17f0f8 100644
--- a/docs/plugins/inspect/plugin-multipart.xml
+++ b/docs/plugins/inspect/plugin-multipart.xml
@@ -3,10 +3,10 @@
multipart stream manipulation
../../gst/multipart/.libs/libgstmultipart.so
libgstmultipart.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-navigationtest.xml b/docs/plugins/inspect/plugin-navigationtest.xml
index 75b9ce4ea7..f6600e189b 100644
--- a/docs/plugins/inspect/plugin-navigationtest.xml
+++ b/docs/plugins/inspect/plugin-navigationtest.xml
@@ -3,10 +3,10 @@
Template for a video filter
../../gst/debugutils/.libs/libgstnavigationtest.so
libgstnavigationtest.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-oss4.xml b/docs/plugins/inspect/plugin-oss4.xml
index c5fcc12e6b..066097c70c 100644
--- a/docs/plugins/inspect/plugin-oss4.xml
+++ b/docs/plugins/inspect/plugin-oss4.xml
@@ -3,10 +3,10 @@
Open Sound System (OSS) version 4 support for GStreamer
../../sys/oss4/.libs/libgstoss4audio.so
libgstoss4audio.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-ossaudio.xml b/docs/plugins/inspect/plugin-ossaudio.xml
index a272cdb812..342af08e50 100644
--- a/docs/plugins/inspect/plugin-ossaudio.xml
+++ b/docs/plugins/inspect/plugin-ossaudio.xml
@@ -3,10 +3,10 @@
OSS (Open Sound System) support for GStreamer
../../sys/oss/.libs/libgstossaudio.so
libgstossaudio.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-png.xml b/docs/plugins/inspect/plugin-png.xml
index ab2abc92a7..1393d536df 100644
--- a/docs/plugins/inspect/plugin-png.xml
+++ b/docs/plugins/inspect/plugin-png.xml
@@ -3,10 +3,10 @@
PNG plugin library
../../ext/libpng/.libs/libgstpng.so
libgstpng.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-pulseaudio.xml b/docs/plugins/inspect/plugin-pulseaudio.xml
index b948b32d6e..c90ef085d5 100644
--- a/docs/plugins/inspect/plugin-pulseaudio.xml
+++ b/docs/plugins/inspect/plugin-pulseaudio.xml
@@ -3,10 +3,10 @@
PulseAudio plugin library
../../ext/pulse/.libs/libgstpulse.so
libgstpulse.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-quicktime.xml b/docs/plugins/inspect/plugin-quicktime.xml
index 331585e699..6aa9ff234a 100644
--- a/docs/plugins/inspect/plugin-quicktime.xml
+++ b/docs/plugins/inspect/plugin-quicktime.xml
@@ -3,10 +3,10 @@
Quicktime support
../../gst/qtdemux/.libs/libgstqtdemux.so
libgstqtdemux.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-replaygain.xml b/docs/plugins/inspect/plugin-replaygain.xml
index 8c9d0b82a6..658e4d6cf4 100644
--- a/docs/plugins/inspect/plugin-replaygain.xml
+++ b/docs/plugins/inspect/plugin-replaygain.xml
@@ -3,10 +3,10 @@
ReplayGain volume normalization
../../gst/replaygain/.libs/libgstreplaygain.so
libgstreplaygain.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-rtp.xml b/docs/plugins/inspect/plugin-rtp.xml
index ec1df9972d..16463b60a9 100644
--- a/docs/plugins/inspect/plugin-rtp.xml
+++ b/docs/plugins/inspect/plugin-rtp.xml
@@ -3,10 +3,10 @@
Real-time protocol plugins
../../gst/rtp/.libs/libgstrtp.so
libgstrtp.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-rtsp.xml b/docs/plugins/inspect/plugin-rtsp.xml
index 161d9085a8..15d97f7031 100644
--- a/docs/plugins/inspect/plugin-rtsp.xml
+++ b/docs/plugins/inspect/plugin-rtsp.xml
@@ -3,10 +3,10 @@
transfer data via RTSP
../../gst/rtsp/.libs/libgstrtsp.so
libgstrtsp.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-shapewipe.xml b/docs/plugins/inspect/plugin-shapewipe.xml
index 0baccd5454..1cc06ebe4f 100644
--- a/docs/plugins/inspect/plugin-shapewipe.xml
+++ b/docs/plugins/inspect/plugin-shapewipe.xml
@@ -3,10 +3,10 @@
Shape Wipe transition filter
../../gst/shapewipe/.libs/libgstshapewipe.so
libgstshapewipe.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-shout2send.xml b/docs/plugins/inspect/plugin-shout2send.xml
index e26a188fb1..71681a61dc 100644
--- a/docs/plugins/inspect/plugin-shout2send.xml
+++ b/docs/plugins/inspect/plugin-shout2send.xml
@@ -3,7 +3,7 @@
Sends data to an icecast server using libshout2
../../ext/shout2/.libs/libgstshout2.so
libgstshout2.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
libshout2
diff --git a/docs/plugins/inspect/plugin-smpte.xml b/docs/plugins/inspect/plugin-smpte.xml
index c39b5e38ae..38e990a47b 100644
--- a/docs/plugins/inspect/plugin-smpte.xml
+++ b/docs/plugins/inspect/plugin-smpte.xml
@@ -3,10 +3,10 @@
Apply the standard SMPTE transitions on video images
../../gst/smpte/.libs/libgstsmpte.so
libgstsmpte.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-soup.xml b/docs/plugins/inspect/plugin-soup.xml
index c71f8b43a2..b61bbae420 100644
--- a/docs/plugins/inspect/plugin-soup.xml
+++ b/docs/plugins/inspect/plugin-soup.xml
@@ -3,10 +3,10 @@
libsoup HTTP client src
../../ext/soup/.libs/libgstsouphttpsrc.so
libgstsouphttpsrc.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-spectrum.xml b/docs/plugins/inspect/plugin-spectrum.xml
index 61e3965a20..27e14174c6 100644
--- a/docs/plugins/inspect/plugin-spectrum.xml
+++ b/docs/plugins/inspect/plugin-spectrum.xml
@@ -3,10 +3,10 @@
Run an FFT on the audio signal, output spectrum data
../../gst/spectrum/.libs/libgstspectrum.so
libgstspectrum.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-speex.xml b/docs/plugins/inspect/plugin-speex.xml
index b9c417995b..687ec79379 100644
--- a/docs/plugins/inspect/plugin-speex.xml
+++ b/docs/plugins/inspect/plugin-speex.xml
@@ -3,10 +3,10 @@
Speex plugin library
../../ext/speex/.libs/libgstspeex.so
libgstspeex.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-taglib.xml b/docs/plugins/inspect/plugin-taglib.xml
index 5fa29c0901..7476bbff81 100644
--- a/docs/plugins/inspect/plugin-taglib.xml
+++ b/docs/plugins/inspect/plugin-taglib.xml
@@ -3,10 +3,10 @@
Tag writing plug-in based on taglib
../../ext/taglib/.libs/libgsttaglib.so
libgsttaglib.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-udp.xml b/docs/plugins/inspect/plugin-udp.xml
index f3c971bb5c..c706226408 100644
--- a/docs/plugins/inspect/plugin-udp.xml
+++ b/docs/plugins/inspect/plugin-udp.xml
@@ -3,10 +3,10 @@
transfer data via UDP
../../gst/udp/.libs/libgstudp.so
libgstudp.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-video4linux2.xml b/docs/plugins/inspect/plugin-video4linux2.xml
index 3a668a2473..e33c469f4d 100644
--- a/docs/plugins/inspect/plugin-video4linux2.xml
+++ b/docs/plugins/inspect/plugin-video4linux2.xml
@@ -3,10 +3,10 @@
elements for Video 4 Linux
../../sys/v4l2/.libs/libgstvideo4linux2.so
libgstvideo4linux2.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-videobox.xml b/docs/plugins/inspect/plugin-videobox.xml
index 78ee910191..5bfb795a3f 100644
--- a/docs/plugins/inspect/plugin-videobox.xml
+++ b/docs/plugins/inspect/plugin-videobox.xml
@@ -3,10 +3,10 @@
resizes a video by adding borders or cropping
../../gst/videobox/.libs/libgstvideobox.so
libgstvideobox.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-videocrop.xml b/docs/plugins/inspect/plugin-videocrop.xml
index dbaa63e986..7e1b65f429 100644
--- a/docs/plugins/inspect/plugin-videocrop.xml
+++ b/docs/plugins/inspect/plugin-videocrop.xml
@@ -3,10 +3,10 @@
Crops video into a user-defined region
../../gst/videocrop/.libs/libgstvideocrop.so
libgstvideocrop.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-videofilter.xml b/docs/plugins/inspect/plugin-videofilter.xml
index 43d63a998f..212981d4fd 100644
--- a/docs/plugins/inspect/plugin-videofilter.xml
+++ b/docs/plugins/inspect/plugin-videofilter.xml
@@ -3,10 +3,10 @@
Video filters plugin
../../gst/videofilter/.libs/libgstvideofilter.so
libgstvideofilter.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-videomixer.xml b/docs/plugins/inspect/plugin-videomixer.xml
index fdf3fdfb0c..b2964cc89b 100644
--- a/docs/plugins/inspect/plugin-videomixer.xml
+++ b/docs/plugins/inspect/plugin-videomixer.xml
@@ -3,10 +3,10 @@
Video mixer
../../gst/videomixer/.libs/libgstvideomixer.so
libgstvideomixer.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
@@ -30,5 +30,26 @@
+
+ videomixer2
+ Video mixer 2
+ Filter/Editor/Video
+ Mix multiple video streams
+ Wim Taymans <wim@fluendo.com>, Sebastian Dröge <sebastian.droege@collabora.co.uk>
+
+
+ sink_%d
+ sink
+ request
+ video/x-raw-yuv, format=(fourcc)AYUV, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)32, depth=(int)32, endianness=(int)4321, red_mask=(int)65280, green_mask=(int)16711680, blue_mask=(int)-16777216, alpha_mask=(int)255, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)32, depth=(int)32, endianness=(int)4321, red_mask=(int)16711680, green_mask=(int)65280, blue_mask=(int)255, alpha_mask=(int)-16777216, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)32, depth=(int)32, endianness=(int)4321, red_mask=(int)-16777216, green_mask=(int)16711680, blue_mask=(int)65280, alpha_mask=(int)255, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)32, depth=(int)32, endianness=(int)4321, red_mask=(int)255, green_mask=(int)65280, blue_mask=(int)16711680, alpha_mask=(int)-16777216, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-yuv, format=(fourcc)Y444, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-yuv, format=(fourcc)Y42B, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-yuv, format=(fourcc)YUY2, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-yuv, format=(fourcc)YVYU, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-yuv, format=(fourcc)I420, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-yuv, format=(fourcc)YV12, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-yuv, format=(fourcc)Y41B, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)24, depth=(int)24, endianness=(int)4321, red_mask=(int)16711680, green_mask=(int)65280, blue_mask=(int)255, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)24, depth=(int)24, endianness=(int)4321, red_mask=(int)255, green_mask=(int)65280, blue_mask=(int)16711680, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)32, depth=(int)24, endianness=(int)4321, red_mask=(int)16711680, green_mask=(int)65280, blue_mask=(int)255, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)32, depth=(int)24, endianness=(int)4321, red_mask=(int)255, green_mask=(int)65280, blue_mask=(int)16711680, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)32, depth=(int)24, endianness=(int)4321, red_mask=(int)-16777216, green_mask=(int)16711680, blue_mask=(int)65280, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)32, depth=(int)24, endianness=(int)4321, red_mask=(int)65280, green_mask=(int)16711680, blue_mask=(int)-16777216, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]
+
+
+ src
+ source
+ always
+ video/x-raw-yuv, format=(fourcc)AYUV, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)32, depth=(int)32, endianness=(int)4321, red_mask=(int)65280, green_mask=(int)16711680, blue_mask=(int)-16777216, alpha_mask=(int)255, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)32, depth=(int)32, endianness=(int)4321, red_mask=(int)16711680, green_mask=(int)65280, blue_mask=(int)255, alpha_mask=(int)-16777216, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)32, depth=(int)32, endianness=(int)4321, red_mask=(int)-16777216, green_mask=(int)16711680, blue_mask=(int)65280, alpha_mask=(int)255, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)32, depth=(int)32, endianness=(int)4321, red_mask=(int)255, green_mask=(int)65280, blue_mask=(int)16711680, alpha_mask=(int)-16777216, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-yuv, format=(fourcc)Y444, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-yuv, format=(fourcc)Y42B, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-yuv, format=(fourcc)YUY2, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-yuv, format=(fourcc)UYVY, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-yuv, format=(fourcc)YVYU, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-yuv, format=(fourcc)I420, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-yuv, format=(fourcc)YV12, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-yuv, format=(fourcc)Y41B, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)24, depth=(int)24, endianness=(int)4321, red_mask=(int)16711680, green_mask=(int)65280, blue_mask=(int)255, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)24, depth=(int)24, endianness=(int)4321, red_mask=(int)255, green_mask=(int)65280, blue_mask=(int)16711680, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)32, depth=(int)24, endianness=(int)4321, red_mask=(int)16711680, green_mask=(int)65280, blue_mask=(int)255, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)32, depth=(int)24, endianness=(int)4321, red_mask=(int)255, green_mask=(int)65280, blue_mask=(int)16711680, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)32, depth=(int)24, endianness=(int)4321, red_mask=(int)-16777216, green_mask=(int)16711680, blue_mask=(int)65280, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)32, depth=(int)24, endianness=(int)4321, red_mask=(int)65280, green_mask=(int)16711680, blue_mask=(int)-16777216, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]
+
+
+
\ No newline at end of file
diff --git a/docs/plugins/inspect/plugin-wavenc.xml b/docs/plugins/inspect/plugin-wavenc.xml
index 6d390944d6..38250559e5 100644
--- a/docs/plugins/inspect/plugin-wavenc.xml
+++ b/docs/plugins/inspect/plugin-wavenc.xml
@@ -3,10 +3,10 @@
Encode raw audio into WAV
../../gst/wavenc/.libs/libgstwavenc.so
libgstwavenc.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-wavpack.xml b/docs/plugins/inspect/plugin-wavpack.xml
index adcc0ff7c6..4ce36549ed 100644
--- a/docs/plugins/inspect/plugin-wavpack.xml
+++ b/docs/plugins/inspect/plugin-wavpack.xml
@@ -3,10 +3,10 @@
Wavpack lossless/lossy audio format handling
../../ext/wavpack/.libs/libgstwavpack.so
libgstwavpack.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-wavparse.xml b/docs/plugins/inspect/plugin-wavparse.xml
index 4a4ccaaa9e..cccb4575fa 100644
--- a/docs/plugins/inspect/plugin-wavparse.xml
+++ b/docs/plugins/inspect/plugin-wavparse.xml
@@ -3,10 +3,10 @@
Parse a .wav file into raw audio
../../gst/wavparse/.libs/libgstwavparse.so
libgstwavparse.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-ximagesrc.xml b/docs/plugins/inspect/plugin-ximagesrc.xml
index d7ba625d9b..d259812350 100644
--- a/docs/plugins/inspect/plugin-ximagesrc.xml
+++ b/docs/plugins/inspect/plugin-ximagesrc.xml
@@ -3,10 +3,10 @@
X11 video input plugin using standard Xlib calls
../../sys/ximage/.libs/libgstximagesrc.so
libgstximagesrc.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/docs/plugins/inspect/plugin-y4menc.xml b/docs/plugins/inspect/plugin-y4menc.xml
index 31a74264c0..20cd5b259e 100644
--- a/docs/plugins/inspect/plugin-y4menc.xml
+++ b/docs/plugins/inspect/plugin-y4menc.xml
@@ -3,10 +3,10 @@
Encodes a YUV frame into the yuv4mpeg format (mjpegtools)
../../gst/y4m/.libs/libgsty4menc.so
libgsty4menc.so
- 0.10.25.1
+ 0.10.24.5
LGPL
gst-plugins-good
- GStreamer Good Plug-ins git
+ GStreamer Good Plug-ins prerelease
Unknown package origin
diff --git a/gst/videomixer/Makefile.am b/gst/videomixer/Makefile.am
index 583224847a..778af4dbd0 100644
--- a/gst/videomixer/Makefile.am
+++ b/gst/videomixer/Makefile.am
@@ -26,4 +26,5 @@ noinst_HEADERS = \
videomixerpad.h \
blend.h \
videomixer2.h \
+ videomixer2pad.h \
gstcollectpads2.h
diff --git a/gst/videomixer/videomixer2.c b/gst/videomixer/videomixer2.c
index 8c9cbc042f..c9d46f34b6 100644
--- a/gst/videomixer/videomixer2.c
+++ b/gst/videomixer/videomixer2.c
@@ -18,6 +18,70 @@
* Boston, MA 02111-1307, USA.
*/
+/**
+ * SECTION:element-videomixer2
+ *
+ * Videomixer2 can accept AYUV, ARGB and BGRA video streams. For each of the requested
+ * sink pads it will compare the incoming geometry and framerate to define the
+ * output parameters. Indeed output video frames will have the geometry of the
+ * biggest incoming video stream and the framerate of the fastest incoming one.
+ *
+ * All sink pads must be either AYUV, ARGB or BGRA, but a mixture of them is not
+ * supported. The src pad will have the same colorspace as the sinks.
+ * No colorspace conversion is done.
+ *
+ * Individual parameters for each input stream can be configured on the
+ * #GstVideoMixer2Pad.
+ *
+ * At this stage, videomixer2 is considered UNSTABLE. The API provided in the
+ * properties may yet change in the near future. When videomixer2 is stable,
+ * it will replace #videomixer
+ *
+ *
+ * Sample pipelines
+ * |[
+ * gst-launch-0.10 \
+ * videotestsrc pattern=1 ! \
+ * video/x-raw-yuv,format=\(fourcc\)AYUV,framerate=\(fraction\)10/1,width=100,height=100 ! \
+ * videobox border-alpha=0 top=-70 bottom=-70 right=-220 ! \
+ * videomixer2 name=mix sink_0::alpha=0.7 sink_1::alpha=0.5 ! \
+ * ffmpegcolorspace ! xvimagesink \
+ * videotestsrc ! \
+ * video/x-raw-yuv,format=\(fourcc\)AYUV,framerate=\(fraction\)5/1,width=320,height=240 ! mix.
+ * ]| A pipeline to demonstrate videomixer used together with videobox.
+ * This should show a 320x240 pixels video test source with some transparency
+ * showing the background checker pattern. Another video test source with just
+ * the snow pattern of 100x100 pixels is overlayed on top of the first one on
+ * the left vertically centered with a small transparency showing the first
+ * video test source behind and the checker pattern under it. Note that the
+ * framerate of the output video is 10 frames per second.
+ * |[
+ * gst-launch videotestsrc pattern=1 ! \
+ * video/x-raw-rgb, framerate=\(fraction\)10/1, width=100, height=100 ! \
+ * videomixer2 name=mix ! ffmpegcolorspace ! ximagesink \
+ * videotestsrc ! \
+ * video/x-raw-rgb, framerate=\(fraction\)5/1, width=320, height=240 ! mix.
+ * ]| A pipeline to demostrate bgra mixing. (This does not demonstrate alpha blending).
+ * |[
+ * gst-launch videotestsrc pattern=1 ! \
+ * video/x-raw-yuv,format =\(fourcc\)I420, framerate=\(fraction\)10/1, width=100, height=100 ! \
+ * videomixer2 name=mix ! ffmpegcolorspace ! ximagesink \
+ * videotestsrc ! \
+ * video/x-raw-yuv,format=\(fourcc\)I420, framerate=\(fraction\)5/1, width=320, height=240 ! mix.
+ * ]| A pipeline to test I420
+ * |[
+ * gst-launch videomixer2 name=mixer sink_1::alpha=0.5 sink_1::xpos=50 sink_1::ypos=50 ! \
+ * ffmpegcolorspace ! ximagesink \
+ * videotestsrc pattern=snow timestamp-offset=3000000000 ! \
+ * "video/x-raw-yuv,format=(fourcc)AYUV,width=640,height=480,framerate=(fraction)30/1" ! \
+ * timeoverlay ! queue2 ! mixer. \
+ * videotestsrc pattern=smpte ! \
+ * "video/x-raw-yuv,format=(fourcc)AYUV,width=800,height=600,framerate=(fraction)10/1" ! \
+ * timeoverlay ! queue2 ! mixer.
+ * ]| A pipeline to demonstrate synchronized mixing (the second stream starts after 3 seconds)
+ *
+ */
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -25,6 +89,7 @@
#include
#include "videomixer2.h"
+#include "videomixer2pad.h"
#include
@@ -86,21 +151,6 @@ _do_init (GType object_type)
&child_proxy_info);
}
-/* GstVideoMixer2Pad */
-#define GST_TYPE_VIDEO_MIXER2_PAD (gst_videomixer2_pad_get_type())
-#define GST_VIDEO_MIXER2_PAD(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VIDEO_MIXER2_PAD, GstVideoMixer2Pad))
-#define GST_VIDEO_MIXER2_PAD_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VIDEO_MIXER_PAD, GstVideoMixer2PadClass))
-#define GST_IS_VIDEO_MIXER2_PAD(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VIDEO_MIXER2_PAD))
-#define GST_IS_VIDEO_MIXER2_PAD_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VIDEO_MIXER2_PAD))
-
-typedef struct _GstVideoMixer2Pad GstVideoMixer2Pad;
-typedef struct _GstVideoMixer2PadClass GstVideoMixer2PadClass;
-typedef struct _GstVideoMixer2Collect GstVideoMixer2Collect;
-
struct _GstVideoMixer2Collect
{
GstCollectData2 collect; /* we extend the CollectData */
@@ -114,29 +164,6 @@ struct _GstVideoMixer2Collect
GstClockTime end_time;
};
-/* all information needed for one video stream */
-struct _GstVideoMixer2Pad
-{
- GstPad parent; /* subclass the pad */
-
- /* caps */
- gint width, height;
- gint fps_n;
- gint fps_d;
-
- /* properties */
- gint xpos, ypos;
- guint zorder;
- gdouble alpha;
-
- GstVideoMixer2Collect *mixcol;
-};
-
-struct _GstVideoMixer2PadClass
-{
- GstPadClass parent_class;
-};
-
#define DEFAULT_PAD_ZORDER 0
#define DEFAULT_PAD_XPOS 0
#define DEFAULT_PAD_YPOS 0
@@ -150,7 +177,6 @@ enum
PROP_PAD_ALPHA
};
-GType gst_videomixer2_pad_get_type (void);
G_DEFINE_TYPE (GstVideoMixer2Pad, gst_videomixer2_pad, GST_TYPE_PAD);
static void
diff --git a/gst/videomixer/videomixer2.h b/gst/videomixer/videomixer2.h
index 2b698a4ce5..14a82fe84a 100644
--- a/gst/videomixer/videomixer2.h
+++ b/gst/videomixer/videomixer2.h
@@ -67,6 +67,8 @@ struct _GstVideoMixer2
{
GstElement element;
+ /* < private > */
+
/* pad */
GstPad *srcpad;
diff --git a/gst/videomixer/videomixer2pad.h b/gst/videomixer/videomixer2pad.h
new file mode 100644
index 0000000000..af0050814a
--- /dev/null
+++ b/gst/videomixer/videomixer2pad.h
@@ -0,0 +1,77 @@
+/* Generic video mixer plugin
+ * Copyright (C) 2008 Wim Taymans
+ * Copyright (C) 2010 Sebastian Dröge
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __GST_VIDEO_MIXER2_PAD_H__
+#define __GST_VIDEO_MIXER2_PAD_H__
+
+#include
+#include
+
+#include "gstcollectpads2.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_VIDEO_MIXER2_PAD (gst_videomixer2_pad_get_type())
+#define GST_VIDEO_MIXER2_PAD(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VIDEO_MIXER2_PAD, GstVideoMixer2Pad))
+#define GST_VIDEO_MIXER2_PAD_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VIDEO_MIXER_PAD, GstVideoMixer2PadClass))
+#define GST_IS_VIDEO_MIXER2_PAD(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VIDEO_MIXER2_PAD))
+#define GST_IS_VIDEO_MIXER2_PAD_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VIDEO_MIXER2_PAD))
+
+typedef struct _GstVideoMixer2Pad GstVideoMixer2Pad;
+typedef struct _GstVideoMixer2PadClass GstVideoMixer2PadClass;
+typedef struct _GstVideoMixer2Collect GstVideoMixer2Collect;
+
+/**
+ * GstVideoMixer2Pad:
+ *
+ * The opaque #GstVideoMixer2Pad structure.
+ */
+struct _GstVideoMixer2Pad
+{
+ GstPad parent;
+
+ /* < private > */
+
+ /* caps */
+ gint width, height;
+ gint fps_n;
+ gint fps_d;
+
+ /* properties */
+ gint xpos, ypos;
+ guint zorder;
+ gdouble alpha;
+
+ GstVideoMixer2Collect *mixcol;
+};
+
+struct _GstVideoMixer2PadClass
+{
+ GstPadClass parent_class;
+};
+
+GType gst_videomixer2_pad_get_type (void);
+
+G_END_DECLS
+#endif /* __GST_VIDEO_MIXER2_PAD_H__ */