am 80c46255: am 874a074a: Merge "avcenc: Switch malloc/free callbacks to use...
am 80c46255: am 874a074a: Merge "avcenc: Switch malloc/free callbacks to use pointers instead of ints"
* commit '80c46255':
avcenc: Switch malloc/free callbacks to use pointers instead of ints