am 68ecb32e: Merge "stagefright aacenc: Move system headers before local headers"

* commit '68ecb32eed09e1c6e834269e8f0c248ccb4097cf':
  stagefright aacenc: Move system headers before local headers
This commit is contained in:
Jean-Baptiste Queru
2012-06-11 14:18:58 -07:00
committed by Android Git Automerger

View File

@@ -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 */