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
..
ext	move ffmpeg stuff to gst-ffmpeg module	2004-02-13 15:11:50 +00:00
gst	Merge remote-tracking branch 'origin/master' into 0.11	2011-12-08 01:19:03 +00:00
Makefile.am	configure.ac: added GST_LIB_LDFLAGS and GST_ALL_LDFLAGS	2005-11-27 16:18:50 +00:00