use overwrite for scene change detector
Merge pull request #566 from volvet/develop_b

use overwrite for scene change detector
add complexity calculation parameter for screen content
Merge pull request #571 from ruil2/encoder_nal

add complexity calculation parameter for screen content
Change the output of diamond search from qpel to interpel
Merge pull request #572 from sijchen/me_merge62

[Encoder ME] Change the output of diamond search from qpel to interpel
reorganize tests
remove relative include paths
fix a typo
fix make test failure issue
Merge pull request #573 from licaiguo/reorgut2

reorganize tests
    move some common functions to common.cpp and add some functions in common
Use the right linker output parameters for codec_unittest.exe

This also includes the -nologo parameter to silence extra output
from the compiler/linker.

Also add a separating empty line between the codec_unittest rule
and the include for dependency rules.
Merge pull request #574 from ruil2/vp_update

    move some common functions to common.cpp and add some functions in c...
Remove unused *_LIBS make variables
Merge pull request #576 from mstorsjo/link-flag-cleanup

Remove unused *_LIBS make variables
Merge pull request #575 from mstorsjo/make-fixes

Use the right linker output parameters for codec_unittest.exe
Remove accidentally added dos newlines
Merge pull request #577 from mstorsjo/remove-dos-newlines

Remove accidentally added dos newlines
Merge remote-tracking branch 'upstream/master' into travis.android