am 7bce428c: (-s ours) am 6fd507b9: Merge "stagefright avcenc: Switch tmp...
am 7bce428c: (-s ours) am 6fd507b9: Merge "stagefright avcenc: Switch tmp variables to use the right type, to avoid casting"
* commit '7bce428c':
stagefright avcenc: Switch tmp variables to use the right type, to avoid casting