diff options
| author | Conley Owens <cco3@android.com> | 2012-03-09 15:10:08 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-03-09 15:10:08 -0800 |
| commit | c24f5ba4ee2873d6fd980229f0d24c80104d3558 (patch) | |
| tree | eb866a39cea17d9985d855c338cfc5d8790bc676 /media/libstagefright/codecs | |
| parent | 66da3fdce4dc61f7d1c125eda9b2e065658cc0e5 (diff) | |
| parent | 9a3f3b9db63e7e109a417c0959b8bc589ab70e04 (diff) | |
| download | frameworks_base-c24f5ba4ee2873d6fd980229f0d24c80104d3558.zip frameworks_base-c24f5ba4ee2873d6fd980229f0d24c80104d3558.tar.gz frameworks_base-c24f5ba4ee2873d6fd980229f0d24c80104d3558.tar.bz2 | |
am 9a3f3b9d: am 67cf093d: Merge "stagefright amrwbenc: Simplify the definition of static_vo"
* commit '9a3f3b9db63e7e109a417c0959b8bc589ab70e04':
stagefright amrwbenc: Simplify the definition of static_vo
Diffstat (limited to 'media/libstagefright/codecs')
| -rw-r--r-- | media/libstagefright/codecs/amrwbenc/inc/basic_op.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/media/libstagefright/codecs/amrwbenc/inc/basic_op.h b/media/libstagefright/codecs/amrwbenc/inc/basic_op.h index c23dce6..f42a27c 100644 --- a/media/libstagefright/codecs/amrwbenc/inc/basic_op.h +++ b/media/libstagefright/codecs/amrwbenc/inc/basic_op.h @@ -29,11 +29,7 @@ #define MIN_16 (Word16)-32768 /* 0x8000 */ -#ifdef LINUX -#define static_vo static __inline__ -#else #define static_vo static __inline -#endif #define saturate(L_var1) (((L_var1) > 0X00007fffL) ? (MAX_16): (((L_var1) < (Word32) 0xffff8000L) ? (MIN_16): ((L_var1) & 0xffff))) |