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_multistream_encoder.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'drivers/opus/opus_multistream_encoder.c') diff --git a/drivers/opus/opus_multistream_encoder.c b/drivers/opus/opus_multistream_encoder.c index 8d559743ea..f0c5f1f9c3 100644 --- a/drivers/opus/opus_multistream_encoder.c +++ b/drivers/opus/opus_multistream_encoder.c @@ -26,21 +26,21 @@ */ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "opus_multistream.h" -#include "opus.h" -#include "opus_private.h" -#include "stack_alloc.h" +#include "opus/opus_multistream.h" +#include "opus/opus.h" +#include "opus/opus_private.h" +#include "opus/celt/stack_alloc.h" #include -#include "float_cast.h" -#include "os_support.h" -#include "mathops.h" -#include "mdct.h" -#include "opus_modes.h" -#include "bands.h" -#include "quant_bands.h" +#include "opus/celt/float_cast.h" +#include "opus/celt/os_support.h" +#include "opus/celt/mathops.h" +#include "opus/celt/mdct.h" +#include "opus/celt/opus_modes.h" +#include "opus/celt/bands.h" +#include "opus/celt/quant_bands.h" typedef struct { int nb_streams; -- 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_multistream_encoder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/opus/opus_multistream_encoder.c') diff --git a/drivers/opus/opus_multistream_encoder.c b/drivers/opus/opus_multistream_encoder.c index f0c5f1f9c3..685d2de277 100644 --- a/drivers/opus/opus_multistream_encoder.c +++ b/drivers/opus/opus_multistream_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