Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64085d03 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms" 

* commit '12045502':
  stagefright aacenc: Fix type definitions for 64 bit platforms
parents 4cd2b343 12045502

media/libstagefright/codecs/aacenc/basic_op/typedefs.h

+3 −3
Original line number Diff line number Diff line
@@ -77,12 +77,12 @@ typedef unsigned short UWord16; 
/*

 ********* define 32 bit signed/unsigned types & constants

 */

typedef long Word32;

typedef unsigned long UWord32;

typedef int Word32;

typedef unsigned int UWord32;







#ifdef LINUX

#ifndef _MSC_VER

typedef long long Word64;

typedef unsigned long long UWord64;

#else