gstreamer/ext/cairo
Wim Taymans 225e98d623 Merge branch 'master' into 0.11
Conflicts:
	ext/flac/gstflacenc.c
	ext/jack/gstjackaudioclient.c
	ext/jack/gstjackaudiosink.c
	ext/jack/gstjackaudiosrc.c
	ext/pulse/plugin.c
	ext/shout2/gstshout2.c
	gst/matroska/matroska-mux.c
	gst/rtp/gstrtph264pay.c
2012-02-10 16:23:14 +01:00
..
.gitignore cairooverlay: Add generic Cairo overlay video element. 2011-03-02 22:55:52 +01:00
gstcairo-marshal.list cairooverlay: Add generic Cairo overlay video element. 2011-03-02 22:55:52 +01:00
gstcairo.c cairooverlay: Add generic Cairo overlay video element. 2011-03-02 22:55:52 +01:00
gstcairooverlay.c various: fix pad template leaks 2011-11-28 13:30:27 +00:00
gstcairooverlay.h cairooverlay: Some minor cleanup 2011-03-02 23:14:36 +01:00
gstcairorender.c various: fix pad template leaks 2011-11-28 13:30:27 +00:00
gstcairorender.h cairorender: Fix caps and colorspace handling 2009-07-17 13:41:19 +02:00
gsttextoverlay.c Merge branch 'master' into 0.11 2012-01-10 14:32:32 +01:00
gsttextoverlay.h cairotextoverlay: port to GstCollectPads2 2011-12-14 18:34:25 +00:00
gsttimeoverlay.c various: fix pad template leaks 2011-11-28 13:30:27 +00:00
gsttimeoverlay.h Fix more gobject macros: obj<->klass, GstXXX<->GstXXXClass 2006-06-01 21:07:26 +00:00
Makefile.am cairo: fix build, make sure libgstvideo can be found 2012-01-25 15:21:44 +00:00