Swap aac encoders (again)
Merge pull request #622 from tikuf/master

Swap aac encoders (again)