update
Merge branch 'rename' of https://github.com/ruil2/openh264 into rename

Conflicts:
	codec/encoder/plus/src/welsEncoderExt.cpp