From fc0c4c617538d6fa33808f3acacd9897046bd3d0 Mon Sep 17 00:00:00 2001 From: George Marques Date: Fri, 27 Nov 2015 19:29:48 -0200 Subject: Remove Opus extra includes Remove the extra directories to include that were needed by the Opus library. Now the lib includes more specific paths to avoid those. --- drivers/opus/celt/arm/arm_celt_map.c | 4 ++-- drivers/opus/celt/arm/armcpu.c | 10 +++++----- drivers/opus/celt/arm/fixed_armv5e.h | 2 +- drivers/opus/celt/arm/pitch_arm.h | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'drivers/opus/celt/arm') diff --git a/drivers/opus/celt/arm/arm_celt_map.c b/drivers/opus/celt/arm/arm_celt_map.c index b187345154..7c8b62f5c9 100644 --- a/drivers/opus/celt/arm/arm_celt_map.c +++ b/drivers/opus/celt/arm/arm_celt_map.c @@ -26,10 +26,10 @@ */ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "pitch.h" +#include "opus/celt/pitch.h" #if defined(OPUS_HAVE_RTCD) diff --git a/drivers/opus/celt/arm/armcpu.c b/drivers/opus/celt/arm/armcpu.c index 7f0af631b9..a464820658 100644 --- a/drivers/opus/celt/arm/armcpu.c +++ b/drivers/opus/celt/arm/armcpu.c @@ -28,15 +28,15 @@ /* Original code from libtheora modified to suit to Opus */ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif #ifdef OPUS_HAVE_RTCD -#include "armcpu.h" -#include "cpu_support.h" -#include "os_support.h" -#include "opus_types.h" +#include "opus/celt/arm/armcpu.h" +#include "opus/celt/cpu_support.h" +#include "opus/celt/os_support.h" +#include "opus/opus_types.h" #define OPUS_CPU_ARM_V4 (1) #define OPUS_CPU_ARM_EDSP (1<<1) diff --git a/drivers/opus/celt/arm/fixed_armv5e.h b/drivers/opus/celt/arm/fixed_armv5e.h index 1194a7d3ec..cb6e4c1da9 100644 --- a/drivers/opus/celt/arm/fixed_armv5e.h +++ b/drivers/opus/celt/arm/fixed_armv5e.h @@ -30,7 +30,7 @@ #ifndef FIXED_ARMv5E_H #define FIXED_ARMv5E_H -#include "fixed_armv4.h" +#include "opus/celt/arm/fixed_armv4.h" /** 16x32 multiplication, followed by a 16-bit shift right. Results fits in 32 bits */ #undef MULT16_32_Q16 diff --git a/drivers/opus/celt/arm/pitch_arm.h b/drivers/opus/celt/arm/pitch_arm.h index df5e82ef0b..18d1f2e75e 100644 --- a/drivers/opus/celt/arm/pitch_arm.h +++ b/drivers/opus/celt/arm/pitch_arm.h @@ -28,7 +28,7 @@ #if !defined(PITCH_ARM_H) # define PITCH_ARM_H -# include "armcpu.h" +# include "opus/celt/arm/armcpu.h" # if defined(OPUS_FIXED_POINT) -- cgit v1.2.3