diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-01-25 09:17:45 -0800 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-01-25 09:17:46 -0800 |
| commit | 12045502c49bfee40d7d3cb806d9b70d3b5d3ed3 (patch) | |
| tree | ef22c900ba7aee8f7249ec277ee3f17b0e1fed82 | |
| parent | 98539a4eba7677c0b1ddc12f800c7075851ef302 (diff) | |
| parent | 75261fa1504e80284553f38f08e8dea93f0fb4bd (diff) | |
| download | frameworks_base-12045502c49bfee40d7d3cb806d9b70d3b5d3ed3.zip frameworks_base-12045502c49bfee40d7d3cb806d9b70d3b5d3ed3.tar.gz frameworks_base-12045502c49bfee40d7d3cb806d9b70d3b5d3ed3.tar.bz2 | |
Merge "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 |