Allow avi in aac converter
Merge branch 'master' of github.com:tigris/util