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/opus_encoder.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'drivers/opus/opus_encoder.c') diff --git a/drivers/opus/opus_encoder.c b/drivers/opus/opus_encoder.c index f739daa258..f34648f4da 100644 --- a/drivers/opus/opus_encoder.c +++ b/drivers/opus/opus_encoder.c @@ -26,28 +26,28 @@ */ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif #include -#include "celt.h" -#include "entenc.h" -#include "opus_modes.h" -#include "API.h" -#include "stack_alloc.h" -#include "float_cast.h" -#include "opus.h" -#include "arch.h" -#include "opus_private.h" -#include "os_support.h" -#include "cpu_support.h" -#include "analysis.h" -#include "mathops.h" -#include "tuning_parameters.h" +#include "opus/celt/celt.h" +#include "opus/celt/entenc.h" +#include "opus/celt/opus_modes.h" +#include "opus/silk/API.h" +#include "opus/celt/stack_alloc.h" +#include "opus/celt/float_cast.h" +#include "opus/opus.h" +#include "opus/celt/arch.h" +#include "opus/opus_private.h" +#include "opus/celt/os_support.h" +#include "opus/celt/cpu_support.h" +#include "opus/analysis.h" +#include "opus/celt/mathops.h" +#include "opus/silk/tuning_parameters.h" #ifdef OPUS_FIXED_POINT -#include "fixed/structs_FIX.h" +#include "opus/silk/fixed/structs_FIX.h" #else -#include "float/structs_FLP.h" +#include "opus/silk/float/structs_FLP.h" #endif #define MAX_ENCODER_BUFFER 480 -- 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/opus_encoder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/opus/opus_encoder.c') diff --git a/drivers/opus/opus_encoder.c b/drivers/opus/opus_encoder.c index f34648f4da..890a2514de 100644 --- a/drivers/opus/opus_encoder.c +++ b/drivers/opus/opus_encoder.c @@ -25,7 +25,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