gstreamer/gst-libs/gst/app
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
..
.gitignore gst-libs/gst/app/: Add marshal.list, make it compile and add to cvsignore. 2008-05-07 10:38:23 +00:00
gstapp-marshal.list update marshal list 2011-12-01 15:54:49 +01:00
gstappsink.c Merge remote-tracking branch 'origin/master' into 0.11 2011-12-08 01:19:03 +00:00
gstappsink.h Use the new GstSample for snapshots 2011-12-01 16:53:11 +01:00
gstappsrc.c Merge remote-tracking branch 'origin/master' into 0.11 2011-12-08 01:19:03 +00:00
gstappsrc.h Merge remote-tracking branch 'origin/master' into 0.11 2011-12-02 11:10:17 +00:00
Makefile.am gst-libs: Add --warn-all to introspection scanner 2011-11-25 10:31:38 +01:00