diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-01-25 10:33:42 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-25 10:33:42 -0800 |
| commit | 61bd33968f5df9e67b60ef75e271ad6f4a7702a1 (patch) | |
| tree | 8a4de35215a3e1245706b4ee164471cd5cb6383c /media | |
| parent | 171070d25ee35fbd38cdbb989dab7a62df8ff8cf (diff) | |
| parent | 95306d85005f165e10a25ad45cadadec6e1f6a31 (diff) | |
| download | frameworks_base-61bd33968f5df9e67b60ef75e271ad6f4a7702a1.zip frameworks_base-61bd33968f5df9e67b60ef75e271ad6f4a7702a1.tar.gz frameworks_base-61bd33968f5df9e67b60ef75e271ad6f4a7702a1.tar.bz2 | |
am 95306d85: am 64085d03: am 12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"
* commit '95306d85005f165e10a25ad45cadadec6e1f6a31':
stagefright aacenc: Fix type definitions for 64 bit platforms
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/codecs/aacenc/basic_op/typedefs.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/libstagefright/codecs/aacenc/basic_op/typedefs.h b/media/libstagefright/codecs/aacenc/basic_op/typedefs.h index c924e2c..2d5d956 100644 --- a/media/libstagefright/codecs/aacenc/basic_op/typedefs.h +++ b/media/libstagefright/codecs/aacenc/basic_op/typedefs.h @@ -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 |