remove macros to clear codes
Merge pull request #369 from sijchen/mt_refactor3

[Encoder] remove macros to clear codes
Merge remote-tracking branch 'upstream/master' into travis.osx