diff options
| author | Martin Storsjo <martin@martin.st> | 2011-04-05 17:35:49 +0300 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2012-01-13 21:05:56 +0200 |
| commit | 2db3b238966f5f326010321b698fa938d65b8e8a (patch) | |
| tree | 188e8961baaa23f24f42da72227a0970ef63f497 /media/libstagefright/codecs/aacenc | |
| parent | b676a05348e4c516fa8b57e33b10548e6142c3f8 (diff) | |
| download | frameworks_av-2db3b238966f5f326010321b698fa938d65b8e8a.zip frameworks_av-2db3b238966f5f326010321b698fa938d65b8e8a.tar.gz frameworks_av-2db3b238966f5f326010321b698fa938d65b8e8a.tar.bz2 | |
stagefright aacenc: Fix type definitions for 64 bit platforms
Also don't require LINUX to be defined, enable the MSVC typedefs
only within _MSC_VER.
This fixes a lot of warnings about dereferencing pointer 'winPtr'
breaking strict aliasing rules.
Change-Id: I4afbe0ed81295ebe6e5ee2c7f0fb0cc2dc83c89b
Diffstat (limited to 'media/libstagefright/codecs/aacenc')
| -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 |