diff options
| author | Conley Owens <cco3@android.com> | 2012-03-09 08:54:57 -0800 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-03-09 08:54:59 -0800 |
| commit | dc1696c890698d55aade9dbadf3148c2fac01cd0 (patch) | |
| tree | a2ee84f0f3d80fb879975204b76550af010ba7a1 /media/libstagefright/codecs/amrwbenc | |
| parent | 1f7e2d9906d25b4e709c247d78537ee826d31051 (diff) | |
| parent | dc27bc4b2cd4b95a0d7ba5dd34e3be63e1cc0c9d (diff) | |
| download | frameworks_av-dc1696c890698d55aade9dbadf3148c2fac01cd0.zip frameworks_av-dc1696c890698d55aade9dbadf3148c2fac01cd0.tar.gz frameworks_av-dc1696c890698d55aade9dbadf3148c2fac01cd0.tar.bz2 | |
Merge "stagefright amrwbenc: Simplify the definition of static_vo"
Diffstat (limited to 'media/libstagefright/codecs/amrwbenc')
| -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))) |