OSDN Git Service

am 25dc5f30: Merge "Don\'t coalesce more than 250ms worth of encoded data into a...
authorAndreas Huber <andih@google.com>
Tue, 20 Apr 2010 21:52:57 +0000 (14:52 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 20 Apr 2010 21:52:57 +0000 (14:52 -0700)
commit33383719997e741e774f1ebb8b6882bac51336fd
treeb50f68d7ba3a181e220d06ca20576b04a32772c4
parent394da7727920ee6f8ec3d4b8ba7ed58b8230b4e6
parent7b783a8be7e3aa850b84378042d8754f75eb8fb6
am 25dc5f30: Merge "Don\'t coalesce more than 250ms worth of encoded data into a single codec input buffer. This currently only applies to the component OMX.TI.AAC.decode, it is the only one to support coalescing in the first place." into froyo

Merge commit '25dc5f30b2a8276c5790c7152a801fcd905c7281' into froyo-plus-aosp

* commit '25dc5f30b2a8276c5790c7152a801fcd905c7281':
  Don't coalesce more than 250ms worth of encoded data into a single codec input buffer.