Merge change 8515

* changes:
  Add support for .aac and .asf extensions.