OSDN Git Service

am 874a074a: Merge "avcenc: Switch malloc/free callbacks to use pointers instead...
authorJean-Baptiste Queru <jbq@google.com>
Wed, 8 Aug 2012 20:08:11 +0000 (13:08 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 8 Aug 2012 20:08:11 +0000 (13:08 -0700)
* commit '874a074ad88117d9fabf178b5b4a1c885dc512f5':
  avcenc: Switch malloc/free callbacks to use pointers instead of ints


Trivial merge