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
..
deinterleave.c	various: fix pad template leaks	2011-11-28 13:30:27 +00:00
deinterleave.h	gst/interleave/deinterleave.*: Don't set a getcaps() function on the src pads as it's not required and the default ge...	2008-05-22 18:55:09 +00:00
interleave.c	Merge branch 'master' into 0.11	2012-01-10 14:32:32 +01:00
interleave.h	interleave: port to GstCollectPads2	2011-12-14 18:55:36 +00:00
interleave.vcproj	more working plugins	2004-07-27 21:41:30 +00:00
Makefile.am	android: Make it ready for androgenizer	2011-04-11 01:20:11 +02:00
plugin.c	New elements interleave and deinterleave, implement channel interleaving and deinterleaving.	2007-01-07 22:03:54 +00:00
plugin.h	gst/interleave/: Split definitions into separate header files for better documentation generation.	2008-05-14 07:32:44 +00:00