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
..
2011-11-10 16:05:19 +01:00
2010-08-18 16:42:13 +02:00
2011-12-04 17:16:30 +00:00
2006-05-18 17:19:39 +00:00
2011-12-08 01:19:03 +00:00
2011-12-08 01:19:03 +00:00
2011-06-26 22:58:17 +01:00
2006-06-01 19:19:51 +00:00
2008-06-26 06:03:38 +00:00
2011-11-30 07:57:02 +01:00
2011-04-19 14:22:42 +02:00
2011-11-30 07:57:02 +01:00
2010-03-16 18:31:15 +01:00
2011-12-08 01:19:03 +00:00
2011-08-18 19:15:03 +02:00
2011-12-08 01:19:03 +00:00
2011-11-30 23:15:35 +00:00
2008-10-16 15:07:00 +00:00