sync onflicts:
	codec/encoder/plus/src/welsEncoderExt.cpp
	module/gmp-openh264.cpp