am ceb83b8d: Merge "SoftAMR: Signal the right frame format"

* commit 'ceb83b8d8919dc778402bf610c073987d4f9f89b':
  SoftAMR: Signal the right frame format