gstreamer/gst
Tim-Philipp Müller fb6d09055a Merge remote-tracking branch 'origin/master' into 0.11
Conflicts:
	ext/alsa/gstalsadeviceprobe.c
	ext/alsa/gstalsamixer.c
	ext/pango/gsttextoverlay.c
	ext/pango/gsttextoverlay.h
	gst-libs/gst/audio/gstaudiobasesink.c
	gst-libs/gst/audio/gstaudioringbuffer.c
	gst-libs/gst/audio/gstaudiosrc.c
	gst-libs/gst/video/Makefile.am
	gst-libs/gst/video/video.c
	gst/encoding/gststreamcombiner.c
	gst/encoding/gststreamsplitter.c
	gst/playback/gstplaybasebin.c
	gst/playback/gststreamsynchronizer.c
	gst/playback/gstsubtitleoverlay.c
	gst/playback/gsturidecodebin.c
	sys/xvimage/xvimagesink.c
	tests/examples/Makefile.am
	win32/common/libgstvideo.def

Video overlay composition disabled for now, needs
porting to buffer meta.
2011-12-08 01:19:03 +00:00
..
adder Merge remote-tracking branch 'origin/master' into 0.11 2011-12-02 11:10:17 +00:00
app docs: fixup appsrc/sink api docs 2011-05-23 15:02:27 +03:00
audioconvert Merge remote-tracking branch 'origin/master' into 0.11 2011-12-02 11:10:17 +00:00
audiorate Merge remote-tracking branch 'origin/master' into 0.11 2011-12-02 11:10:17 +00:00
audioresample Merge remote-tracking branch 'origin/master' into 0.11 2011-12-02 11:10:17 +00:00
audiotestsrc various: fix pad template leaks 2011-11-28 13:09:02 +00:00
encoding Work around deprecated thread API in glib master 2011-12-04 17:16:30 +00:00
gdp various: fix pad template leaks 2011-11-28 13:09:02 +00:00
playback Merge remote-tracking branch 'origin/master' into 0.11 2011-12-08 01:19:03 +00:00
subparse various: fix pad template leaks 2011-11-28 13:09:02 +00:00
tcp Merge remote-tracking branch 'origin/master' into 0.11 2011-12-08 01:19:03 +00:00
typefind Merge remote-tracking branch 'origin/master' into 0.11 2011-12-02 11:10:17 +00:00
videoconvert Revert "videoconvert: We can handle GST_VIDEO_META_API" 2011-12-05 20:33:41 +01:00
videorate Merge remote-tracking branch 'origin/master' into 0.11 2011-12-08 01:19:03 +00:00
videoscale various: fix pad template leaks 2011-11-28 13:09:02 +00:00
videotestsrc Merge remote-tracking branch 'origin/master' into 0.11 2011-12-02 11:10:17 +00:00
volume controller: port to GstValueArray removal API change 2011-12-06 08:37:32 +01:00
Makefile.am build: build plugin and example directories in parallel if make -jN is used 2010-03-29 00:26:59 +01:00