Conflicts:
	codec/api/svc/codec_app_def.h
	test/api/encoder_test.cpp
Merge branch 'modi_stra2' of https://github.com/sijchen/openh264 into modi_stra2
update the MD values