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/modes.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'drivers/opus/celt/modes.c') diff --git a/drivers/opus/celt/modes.c b/drivers/opus/celt/modes.c index 3794074aaa..3e085ad06b 100644 --- a/drivers/opus/celt/modes.c +++ b/drivers/opus/celt/modes.c @@ -28,15 +28,15 @@ */ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "celt.h" -#include "opus_modes.h" -#include "rate.h" -#include "os_support.h" -#include "stack_alloc.h" -#include "quant_bands.h" +#include "opus/celt/celt.h" +#include "opus/celt/opus_modes.h" +#include "opus/celt/rate.h" +#include "opus/celt/os_support.h" +#include "opus/celt/stack_alloc.h" +#include "opus/celt/quant_bands.h" static const opus_int16 eband5ms[] = { /*0 200 400 600 800 1k 1.2 1.4 1.6 2k 2.4 2.8 3.2 4k 4.8 5.6 6.8 8k 9.6 12k 15.6 */ @@ -63,9 +63,9 @@ static const unsigned char band_allocation[] = { #ifndef CUSTOM_MODES_ONLY #ifdef OPUS_FIXED_POINT - #include "static_modes_fixed.h" + #include "opus/celt/static_modes_fixed.h" #else - #include "static_modes_float.h" + #include "opus/celt/static_modes_float.h" #endif #endif /* CUSTOM_MODES_ONLY */ -- cgit v1.2.3 From 4057907cf43a7ed53b94448c8d26d56a637efb92 Mon Sep 17 00:00:00 2001 From: George Marques Date: Fri, 27 Nov 2015 19:37:36 -0200 Subject: Remove redundant Opus directive definition Clean up the build command line another extra bit. --- drivers/opus/celt/modes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/opus/celt/modes.c') diff --git a/drivers/opus/celt/modes.c b/drivers/opus/celt/modes.c index 3e085ad06b..aef2681443 100644 --- a/drivers/opus/celt/modes.c +++ b/drivers/opus/celt/modes.c @@ -27,7 +27,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef OPUS_HAVE_CONFIG_H +#ifdef OPUS_ENABLED #include "opus/opus_config.h" #endif -- cgit v1.2.3