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 | 244ffc8b98c8b59cf64ef3d368c3373014a2f230 (patch) | |
| tree | 3e6d7b37be4c6d88bae65f86bbc0452fc2b567e3 | |
| parent | 2d96e2965b3118c4e3cb21a76c9f07e0c8ccfc6e (diff) | |
| parent | 11484788dd0c2ec9fce29c523a7748de34fb9b8a (diff) | |
| download | frameworks_av-244ffc8b98c8b59cf64ef3d368c3373014a2f230.zip frameworks_av-244ffc8b98c8b59cf64ef3d368c3373014a2f230.tar.gz frameworks_av-244ffc8b98c8b59cf64ef3d368c3373014a2f230.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
| -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 |