gstreamer/gst-libs/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
..
app Merge remote-tracking branch 'origin/master' into 0.11 2011-12-08 01:19:03 +00:00
audio Merge remote-tracking branch 'origin/master' into 0.11 2011-12-08 01:19:03 +00:00
fft Merge remote-tracking branch 'origin/master' into 0.11 2011-12-02 11:10:17 +00:00
interfaces xoverlay: Fix mistakes in the sample code 2011-12-05 09:39:08 +01:00
pbutils Merge remote-tracking branch 'origin/master' into 0.11 2011-12-08 01:19:03 +00:00
riff Merge remote-tracking branch 'origin/master' into 0.11 2011-11-26 12:12:59 +00:00
rtp rtp: Initialize GstRTPBuffer before usage 2011-12-05 18:42:24 +01:00
rtsp Merge remote-tracking branch 'origin/master' into 0.11 2011-12-08 01:19:03 +00:00
sdp gst-libs: Add --warn-all to introspection scanner 2011-11-25 10:31:38 +01:00
tag Merge remote-tracking branch 'origin/master' into 0.11 2011-12-08 01:19:03 +00:00
video Merge remote-tracking branch 'origin/master' into 0.11 2011-12-08 01:19:03 +00:00
gettext.h Fix for ENABLE_NLS being undefined for -Wundef 2010-03-16 18:06:16 +01:00
glib-compat-private.h Work around deprecated thread API in glib master 2011-12-04 17:16:30 +00:00
gst-i18n-plugin.h *.h: Revert indenting 2004-03-15 16:32:55 +00:00
Makefile.am Merge remote-tracking branch 'origin/master' into 0.11 2011-12-08 01:19:03 +00:00