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
..
Makefile.am	ximage: rewrite the buffer pool in ximagesink	2011-03-04 16:21:54 +01:00
ximage.c	xvimagesink: use bufferpool	2011-04-06 12:28:46 +02:00
ximagepool.c	update for metadata API changes	2012-02-29 17:25:10 +01:00
ximagepool.h	update for metadata API changes	2012-02-29 17:25:10 +01:00
ximagesink.c	Merge remote-tracking branch 'origin/master' into 0.11	2012-03-08 20:31:34 +00:00
ximagesink.h	x11: use frame copy functions	2011-06-22 15:38:24 +02:00