Commit d459955d authored by Edward Hervey's avatar Edward Hervey

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
parents e16e3e75 81b71b65
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment