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 | 67cf093d86539d4f3db7e2a2b168c9a250c0a5b8 (patch) | |
| tree | ad740c94b2b414f066f31cac32245284b7f9a4cf /media/libstagefright | |
| parent | 6db6ea02b999e86dfbddd08780eeab0034389f93 (diff) | |
| parent | 62b4d5b0ca06b8075a9c79f325176e431a0fb979 (diff) | |
| download | frameworks_base-67cf093d86539d4f3db7e2a2b168c9a250c0a5b8.zip frameworks_base-67cf093d86539d4f3db7e2a2b168c9a250c0a5b8.tar.gz frameworks_base-67cf093d86539d4f3db7e2a2b168c9a250c0a5b8.tar.bz2 | |
Merge "stagefright amrwbenc: Simplify the definition of static_vo"
Diffstat (limited to 'media/libstagefright')
| -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))) |