Tim-Philipp Müller 29c266ccff Merge remote-tracking branch 'origin/master' into 0.11 ... Conflicts: common docs/libs/gst-plugins-base-libs.types ext/pango/gsttextoverlay.c ext/vorbis/gstvorbisdec.c gst/playback/gstplaysink.c gst/playback/gstplaysinkconvertbin.c sys/ximage/ximagesink.c sys/xvimage/xvimagesink.c		2012-03-08 20:31:34 +00:00
..
gstbasetextoverlay.c	GST_FLOW_WRONG_STATE -> GST_FLOW_FLUSHING	2012-02-08 15:17:49 +01:00
gstbasetextoverlay.h	pango: port to new GLib threading API	2012-01-18 17:21:02 +00: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	pango: Fix 'implicit conversion from enumeration type 'GstTextOverlayLineAlign' to different enumeration type 'PangoAlignment'' compiler warning	2012-03-06 13:11:16 +01:00
gsttextoverlay.h	textoverlay: Attach OverlayComposition to buffers when needed	2011-12-05 15:37:04 +00:00
gsttextrender.c	Merge remote-tracking branch 'origin/master' into 0.11	2012-03-08 20:31:34 +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