tree 06bbd40083a1bfe3694b0ba46f58f71878d9c2b4
parent a267dd05fe909ecab0bbc1b1582f41d37d39fd79
parent e4aad70d462ec6c2c641489cff9f616b8a1e21f6
author Andreas Huber <andih@google.com> 1279647972 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1279647972 -0700

am ff45709f: am cc14a839: Support a single format change at the beginning of audio playback. This way the AAC+ decoder may change its output format from what is originally encoded in the audio stream and we\'ll still play it back correctly.

Merge commit 'ff45709fbd1f24de1cf75ce9ce9ac8694ff1abbe'

* commit 'ff45709fbd1f24de1cf75ce9ce9ac8694ff1abbe':
  Support a single format change at the beginning of audio playback. This way the AAC+ decoder may change its output format from what is originally encoded in the audio stream and we'll still play it back correctly.