base

Merge change 22646 into eclair

* changes:
  Make sure not to ask for more buffers when we know that there won't be any, added a quirk for the aac decoder.