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	ext/jack/.cvsignore: Ignore old files as requested by the build slave.	2011-01-02 14:30:06 +00:00
gstjack.c	jack: fix up element details and some other minor clean-ups	2011-01-02 19:51:54 +00:00
gstjack.h	-good: port to new audio caps	2011-09-06 13:16:27 +02:00
gstjackaudioclient.c	Work around deprecated thread API in glib master	2011-12-12 09:46:27 +00:00
gstjackaudioclient.h	jack: added client property	2011-01-02 14:30:08 +00:00
gstjackaudiosink.c	Merge branch 'master' into 0.11	2012-01-10 14:32:32 +01:00
gstjackaudiosink.h	Merge branch 'master' into 0.11	2012-01-10 14:32:32 +01:00
gstjackaudiosrc.c	Merge branch 'master' into 0.11	2012-01-10 14:32:32 +01:00
gstjackaudiosrc.h	Merge branch 'master' into 0.11	2012-01-10 14:32:32 +01:00
gstjackringbuffer.h	update for ringbuffer change	2011-11-11 11:24:00 +01:00
gstjackutil.c	jackaudiosrc: Port to the new multichannel audio caps	2012-01-05 10:36:45 +01:00
gstjackutil.h	jackaudiosrc: Port to the new multichannel audio caps	2012-01-05 10:36:45 +01:00
Makefile.am	jack: fix up element details and some other minor clean-ups	2011-01-02 19:51:54 +00:00