Instead of doing this, just use macros to handle this situation.

Also, fix a minor bug in AAC encoder