Conflicts:
	codec/encoder/core/inc/svc_motion_estimate.h
	codec/encoder/core/src/svc_base_layer_md.cpp
	codec/encoder/core/src/svc_motion_estimate.cpp
	test/encoder/EncUT_MotionEstimate.cpp