| commit | 3269b5314f02eb3724be8d45880f15762fac09c0 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Aug 08 13:11:13 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 08 13:11:13 2012 -0700 |
| tree | 6720852bc5377b410f2f279f5462fbd20cc7a9ad | |
| parent | c107387cef844aabad80ea1430bb768c2605e89f [diff] | |
| parent | 80c46255bcf3d4d5a3ffe9a1ef3aefd9310c6ed4 [diff] |
am 80c46255: am 874a074a: Merge "avcenc: Switch malloc/free callbacks to use pointers instead of ints" * commit '80c46255bcf3d4d5a3ffe9a1ef3aefd9310c6ed4': avcenc: Switch malloc/free callbacks to use pointers instead of ints