Merge "media: use proper pointer as per platform support"