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
..
barboxwipes.c	gst/rtsp/URLS: Some more urls.	2008-06-17 10:14:47 +00:00
gstmask.c	smpte: Add property for inverting the transition mask	2010-04-29 19:28:17 +02:00
gstmask.h	smpte: Add property for inverting the transition mask	2010-04-29 19:28:17 +02:00
gstsmpte.c	Merge branch 'master' into 0.11	2012-01-10 14:32:32 +01:00
gstsmpte.h	smpte: port to GstCollectPads2	2011-12-14 19:13:21 +00:00
gstsmptealpha.c	various: fix pad template leaks	2011-11-28 13:30:27 +00:00
gstsmptealpha.h	smptealpha: Make color format support more generic	2010-04-29 19:28:18 +02:00
Makefile.am	controller: port to new controller location and api	2011-11-04 20:15:48 +01:00
paint.c	Remove trivial unused variables detected by CLang static analyzer.	2009-04-18 18:51:28 +02:00
paint.h	expand tabs	2005-12-06 19:44:58 +00:00
plugin.c	gst/smpte/: Add new plugin that adds the SMPTE transition in the alpha channel of	2008-05-20 09:29:28 +00:00
smpte.vcproj	more working plugins	2004-07-27 21:41:30 +00:00