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/opus_encoder.c | |
| parent | 7aa39b7cae364347cf379bb8f216adf0a79f37c7 (diff) | |
| parent | 68c56f81f9f77f1296826be382958e2ecc38826b (diff) | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'drivers/opus/opus_encoder.c')
| -rw-r--r-- | drivers/opus/opus_encoder.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/drivers/opus/opus_encoder.c b/drivers/opus/opus_encoder.c index f739daa258..890a2514de 100644 --- a/drivers/opus/opus_encoder.c +++ b/drivers/opus/opus_encoder.c @@ -25,29 +25,29 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif #include <stdarg.h> -#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 |