am a42b8f16: am 3f5b2867: Merge change I8f658214 into eclair-mr2

Merge commit 'a42b8f160fb5906638e978a470972d1f50d749ac'

* commit 'a42b8f160fb5906638e978a470972d1f50d749ac':
  Minor tweaks to the mp3 and aac software decoders, propagate duration to output format.