diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-11-28 20:57:23 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-11-28 20:57:23 -0300 |
| commit | 68aaa0f813bed1e33a55b05d70c560023a3d0c6a (patch) | |
| tree | 91a4400e48eb2183d4b15ea526a2f253017fb210 /drivers/opus/silk/SigProc_FIX.h | |
| parent | 7aa39b7cae364347cf379bb8f216adf0a79f37c7 (diff) | |
| parent | 68c56f81f9f77f1296826be382958e2ecc38826b (diff) | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'drivers/opus/silk/SigProc_FIX.h')
| -rw-r--r-- | drivers/opus/silk/SigProc_FIX.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/opus/silk/SigProc_FIX.h b/drivers/opus/silk/SigProc_FIX.h index 1b58057910..f4db0fa9a4 100644 --- a/drivers/opus/silk/SigProc_FIX.h +++ b/drivers/opus/silk/SigProc_FIX.h @@ -38,9 +38,9 @@ extern "C" #define SILK_MAX_ORDER_LPC 16 /* max order of the LPC analysis in schur() and k2a() */ #include <string.h> /* for memset(), memcpy(), memmove() */ -#include "typedef.h" -#include "resampler_structs.h" -#include "macros.h" +#include "opus/silk/typedef.h" +#include "opus/silk/resampler_structs.h" +#include "opus/silk/macros.h" /********************************************************************/ @@ -575,9 +575,9 @@ static OPUS_INLINE opus_int64 silk_max_64(opus_int64 a, opus_int64 b) /* the following seems faster on x86 */ #define silk_SMMUL(a32, b32) (opus_int32)silk_RSHIFT64(silk_SMULL((a32), (b32)), 32) -#include "Inlines.h" -#include "MacroCount.h" -#include "MacroDebug.h" +#include "opus/silk/Inlines.h" +#include "opus/silk/MacroCount.h" +#include "opus/silk/MacroDebug.h" #ifdef OPUS_ARM_INLINE_ASM #include "arm/SigProc_FIX_armv4.h" |