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 | 013b73bfc4d5fb21082ccccf45fa08c18f86aa08 (patch) | |
| tree | d1f5ef6a098384c3ce2ed502c9b0e8db8572bf1d /media/libstagefright/codecs/aacenc/basic_op | |
| parent | ceec4ae3ba8c3c3d5e243647ad7ee2fc39c71c9c (diff) | |
| parent | 2db3b238966f5f326010321b698fa938d65b8e8a (diff) | |
| download | frameworks_av-013b73bfc4d5fb21082ccccf45fa08c18f86aa08.zip frameworks_av-013b73bfc4d5fb21082ccccf45fa08c18f86aa08.tar.gz frameworks_av-013b73bfc4d5fb21082ccccf45fa08c18f86aa08.tar.bz2 | |
Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"
Diffstat (limited to 'media/libstagefright/codecs/aacenc/basic_op')
| -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 |