OSDN Git Service

am 3d4e4fcb: Merge "DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs...
authorLajos Molnar <lajos@google.com>
Fri, 28 Mar 2014 01:45:10 +0000 (01:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 28 Mar 2014 01:45:10 +0000 (01:45 +0000)
commit8bf96c011ff4128f9bf06b892a38d869192d6a25
tree369426fa05f2923450b30b6f6f424a5aa0da7c5b
parent65550a0e17852fe657795508e3bf05bdbfb2520b
parent3d4e4fcbcfc5c16dd794591727f5c713831ab6dc
am 3d4e4fcb: Merge "DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"" into klp-dev

* commit '3d4e4fcbcfc5c16dd794591727f5c713831ab6dc':
  DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"
media/libstagefright/ACodec.cpp
media/libstagefright/OMXCodec.cpp