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-05-27 15:09:25 +03:00
2011-11-30 07:57:02 +01:00
2011-12-02 11:10:17 +00:00
2004-07-26 22:09:59 +00:00
2011-11-13 13:36:29 +00:00
2004-07-27 21:41:30 +00:00
2004-07-27 21:41:30 +00:00
2011-12-08 01:19:03 +00:00
2011-11-28 17:51:41 +01:00
2011-12-02 11:10:17 +00:00
2011-11-11 17:53:03 +01:00
2011-12-06 13:59:11 +01:00
2011-11-12 11:58:58 +00:00
2011-11-11 11:52:47 +01:00
2011-11-10 13:51:23 +01:00
2011-12-08 01:19:03 +00:00
2011-11-28 21:20:10 +00:00
2011-12-08 01:19:03 +00:00
2011-11-28 21:20:10 +00:00
2011-10-28 11:37:31 +02:00
2011-08-19 14:03:23 +02:00
2011-11-11 11:21:41 +01:00
2011-11-11 17:53:03 +01:00
2011-12-08 01:19:03 +00:00
2011-12-06 15:06:12 +01:00
2011-12-08 01:19:03 +00:00
2011-11-11 17:53:03 +01:00
2011-12-08 01:19:03 +00:00
2011-11-11 12:00:52 +01:00
2011-11-30 11:33:41 +01:00
2011-11-30 07:57:02 +01:00
2011-11-30 07:57:02 +01:00
2011-11-30 07:57:02 +01:00
2011-11-30 07:57:02 +01:00
2011-11-30 07:57:02 +01:00
2011-11-30 07:57:02 +01:00
2011-05-24 18:21:06 +02:00
2011-11-30 07:57:02 +01:00
2011-08-29 11:37:36 +02:00
2011-12-02 11:10:17 +00:00
2011-11-30 07:57:02 +01:00
2011-11-30 07:57:02 +01:00
2006-02-17 10:15:52 +00:00