diff options
| author | Conley Owens <cco3@android.com> | 2012-03-09 15:15:35 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-03-09 15:15:35 -0800 |
| commit | c2a4a106d3a0131d5c93f8f512fc02f2a6e8b184 (patch) | |
| tree | 4bffa115b3cf93cb450fe078b83c9f514df7d6b9 /media/libstagefright/codecs | |
| parent | 8f3ca6347650aa17ca06452e5ae1a76921bd2f22 (diff) | |
| parent | ea374096511f92206c264f3f1eb0551a05a34cd5 (diff) | |
| download | frameworks_base-c2a4a106d3a0131d5c93f8f512fc02f2a6e8b184.zip frameworks_base-c2a4a106d3a0131d5c93f8f512fc02f2a6e8b184.tar.gz frameworks_base-c2a4a106d3a0131d5c93f8f512fc02f2a6e8b184.tar.bz2 | |
am ea374096: am c24f5ba4: am 9a3f3b9d: am 67cf093d: Merge "stagefright amrwbenc: Simplify the definition of static_vo"
* commit 'ea374096511f92206c264f3f1eb0551a05a34cd5':
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))) |