Merge change 24447 into eclair

* changes:
  Added some more verbose output for AMR formats. Properly fill out the output format.