CleanUps: Replacing Short with int16_t
Merged in mcwmurugan/x265 (pull request #5)

CleanUps: Replacing Short with int16_t