Sebastian Dröge dc8984d76c Merge branch 'master' into 0.11 ... Conflicts: gst-libs/gst/app/gstappsrc.c gst-libs/gst/audio/multichannel.h gst-libs/gst/video/videooverlay.c gst/playback/gstplaysink.c gst/playback/gststreamsynchronizer.c tests/check/Makefile.am win32/common/libgstvideo.def		2012-01-10 13:15:12 +01:00
..
gstbasetextoverlay.c	add parent to pad functions	2011-11-17 12:48:25 +01:00
gstbasetextoverlay.h	controller: port to new location and api changes	2011-11-04 20:14:54 +01:00
gstclockoverlay.c	Merge branch 'master' into 0.11	2012-01-10 13:15:12 +01:00
gstclockoverlay.h	pango: Create a new base class for all the elements	2011-04-16 15:56:55 +02:00
gsttextoverlay.c	textoverlay: unpremultiply text image	2011-12-05 15:37:04 +00:00
gsttextoverlay.h	textoverlay: Attach OverlayComposition to buffers when needed	2011-12-05 15:37:04 +00:00
gsttextrender.c	various: fix pad template leaks	2011-11-28 13:09:02 +00:00
gsttextrender.h	pango: Use pango-cairo instead of pango-ft2	2009-08-06 06:43:36 +02:00
gsttimeoverlay.c	Merge branch 'master' into 0.11	2012-01-10 13:15:12 +01:00
gsttimeoverlay.h	pango: Create a new base class for all the elements	2011-04-16 15:56:55 +02:00
Makefile.am	controller: port to new location and api changes	2011-11-04 20:14:54 +01:00