gstreamer/ext
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
..
alsa Merge remote-tracking branch 'origin/master' into 0.11 2011-12-08 01:19:03 +00:00
cdparanoia cdparanoia: update for GstCddaBaseSrc -> GstAudioCdSrc renaming 2011-11-12 11:58:58 +00:00
gio update for basesink event handler changes 2011-12-02 22:24:43 +01:00
libvisual Merge remote-tracking branch 'origin/master' into 0.11 2011-12-02 11:10:17 +00:00
ogg Merge remote-tracking branch 'origin/master' into 0.11 2011-12-08 01:19:03 +00:00
pango textoverlay: unpremultiply text image 2011-12-05 15:37:04 +00:00
theora Merge remote-tracking branch 'origin/master' into 0.11 2011-12-02 11:10:17 +00:00
vorbis Merge remote-tracking branch 'origin/master' into 0.11 2011-12-02 11:10:17 +00:00
Makefile.am gnomevfs: remove GnomeVFS plugin 2011-06-15 00:52:47 +01:00