Conflicts:
	codec/encoder/core/src/svc_motion_estimate.cpp