gstreamer/ext
Edward Hervey a8024bb698 Merge remote-tracking branch 'origin/master' into 0.11
Conflicts:
	ext/faac/gstfaac.c
	ext/opus/gstopusdec.c
	ext/opus/gstopusenc.c
	gst/audiovisualizers/gstspacescope.c
	gst/colorspace/colorspace.c
2011-11-25 12:48:58 +01:00
..
opus Merge remote-tracking branch 'origin/master' into 0.11 2011-11-25 12:48:58 +01:00