Merge pull request #3390 from davilla/amlcodec-fixes