diff options
| author | Martin Storsjo <martin@martin.st> | 2012-05-23 15:01:54 +0300 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-06-11 14:26:50 -0700 |
| commit | b5325c8a8fff4d735c24d9a8138e4213ee0833d5 (patch) | |
| tree | b58f6ebbd89a3b25d25fc9095b87f488a2571e79 /media/libstagefright/codecs/aacenc/src/adj_thr.c | |
| parent | 7f9b21922e176f0d28a0932b3e402dc2f7edafbd (diff) | |
| download | frameworks_av-b5325c8a8fff4d735c24d9a8138e4213ee0833d5.zip frameworks_av-b5325c8a8fff4d735c24d9a8138e4213ee0833d5.tar.gz frameworks_av-b5325c8a8fff4d735c24d9a8138e4213ee0833d5.tar.bz2 | |
stagefright aacenc: Move system headers before local headers
This avoids issues with the encoder's own definition of __inline,
which conflicts with headers brought in by string.h in glibc.
Change-Id: I9e3fbf8d892529940ea67a46e67a9abe71d9c5fa
Diffstat (limited to 'media/libstagefright/codecs/aacenc/src/adj_thr.c')
| -rw-r--r-- | media/libstagefright/codecs/aacenc/src/adj_thr.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/aacenc/src/adj_thr.c b/media/libstagefright/codecs/aacenc/src/adj_thr.c index 07b33b7..ccfe883 100644 --- a/media/libstagefright/codecs/aacenc/src/adj_thr.c +++ b/media/libstagefright/codecs/aacenc/src/adj_thr.c @@ -20,13 +20,16 @@ *******************************************************************************/ +/* Include system headers before local headers - the local headers + * redefine __inline, which can mess up definitions in libc headers if + * they happen to use __inline. */ +#include <string.h> #include "basic_op.h" #include "oper_32b.h" #include "adj_thr_data.h" #include "adj_thr.h" #include "qc_data.h" #include "line_pe.h" -#include <string.h> #define minSnrLimit 0x6666 /* 1 dB */ |