gstreamer/sys
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
..
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-10 14:32:32 +01:00
osxaudio various: fix pad template leaks 2011-11-28 13:30:27 +00:00
osxvideo various: fix pad template leaks 2011-11-28 13:30:27 +00:00
sunaudio various: fix pad template leaks 2011-11-28 13:30:27 +00:00
v4l2 Merge branch 'master' into 0.11 2012-01-10 14:32:32 +01:00
waveform Merge branch 'master' into 0.11 2012-01-10 14:32:32 +01:00
ximage Merge branch 'master' into 0.11 2012-01-10 14:32:32 +01:00
Makefile.am waveform: add autotools bits for waveform plugin 2011-12-26 22:22:59 +00:00