Sebastian Dröge 93e3ed5a86 Merge branch 'master' into 0.11 ... Conflicts: ext/cairo/gsttextoverlay.c ext/pulse/pulseaudiosink.c gst/audioparsers/gstaacparse.c gst/avi/gstavimux.c gst/flv/gstflvmux.c gst/interleave/interleave.c gst/isomp4/gstqtmux.c gst/matroska/matroska-demux.c gst/matroska/matroska-mux.c gst/matroska/matroska-mux.h gst/matroska/matroska-read-common.c gst/multifile/gstmultifilesink.c gst/multipart/multipartmux.c gst/shapewipe/gstshapewipe.c gst/smpte/gstsmpte.c gst/udp/gstmultiudpsink.c gst/videobox/gstvideobox.c gst/videocrop/gstaspectratiocrop.c gst/videomixer/videomixer.c gst/videomixer/videomixer2.c gst/wavparse/gstwavparse.c po/ja.po po/lv.po po/sr.po tests/check/Makefile.am tests/check/elements/qtmux.c tests/check/elements/rgvolume.c		2012-01-10 14:32:32 +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 the name of the *-marshall.list file to unbreak make distcheck	2011-03-25 12:53:43 +02:00