Merge pull request #4539 from Matricom/amcodec