OSDN Git Service

(root) / android-x86 / frameworks-av.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c089d02 b96d3c5)
am 52607c53: am d12dc284: Merge "If an error occurs that prevents us from reallocatin...
authorAndreas Huber <andih@google.com>
Wed, 30 Nov 2011 00:33:04 +0000 (16:33 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Nov 2011 00:33:04 +0000 (16:33 -0800)
commit8afbf8e07fd1d75dfa0a517267beb6c1fa818027
tree12a598f6c9508bd248943bec6bf227bca25c4a3ftree | snapshot
parentc089d02cf2bddf1bba6eaa2b2fcce149dc44633ecommit | diff
parentb96d3c5195b148c0d695a326fa9c315561d787efcommit | diff
am 52607c53: am d12dc284: Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1

* commit '52607c5364446df6ac5b2f55cb50e146e6023a4f':
  If an error occurs that prevents us from reallocating buffers during a format change
media/libstagefright/ACodec.cpp diff1 | diff2 | blob | history
frameworks/av
About OSDN
Find Software
Develop Software
Help