fixed bugs from 7c7448e
Merge branch 'master' of https://github.com/mkennedy3000/x265
modified cmake

Merge branch 'master' of https://github.com/mkennedy3000/x265
fixed cmake stuff after satd

Merge branch 'master' of https://github.com/mkennedy3000/x265
satd header file

Merge branch 'master' of https://github.com/mkennedy3000/x265
starting combining with satd, 4x4 working
fixed make files

Merge branch 'master' of https://github.com/mkennedy3000/x265