Merge branch 'master' into 0.11
Conflicts: gst/colorspace/colorspace.c
This commit is contained in:
parent
0dbfad52d9
commit
a2bb20e522
Conflicts: gst/colorspace/colorspace.c