Sebastian Dröge 10554b271f Merge branch 'master' into 0.11 ... Conflicts: ext/flac/gstflacdec.c ext/jpeg/gstjpegenc.c ext/pulse/pulsesink.c sys/v4l2/gstv4l2src.c		2012-01-25 12:49:11 +01:00
..
directsound	various: fix pad template leaks	2011-11-28 13:30:27 +00:00
oss	oss: Port to the new multichannel caps and the raw audio caps interleaved field	2012-01-05 10:30:30 +01:00
oss4	Merge branch 'master' into 0.11	2012-01-25 12:49:11 +01:00
osxaudio	various: fix pad template leaks	2011-11-28 13:30:27 +00:00
osxvideo	Merge branch 'master' into 0.11	2012-01-25 12:49:11 +01:00
sunaudio	various: fix pad template leaks	2011-11-28 13:30:27 +00:00
v4l2	Merge branch 'master' into 0.11	2012-01-25 12:49:11 +01:00
waveform	Merge branch 'master' into 0.11	2012-01-25 12:49:11 +01:00
ximage	port to new gthread API	2012-01-19 11:33:53 +01:00
Makefile.am	waveform: add autotools bits for waveform plugin	2011-12-26 22:22:59 +00:00