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/silk/enc_API.c | |
parent | 7aa39b7cae364347cf379bb8f216adf0a79f37c7 (diff) | |
parent | 68c56f81f9f77f1296826be382958e2ecc38826b (diff) |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'drivers/opus/silk/enc_API.c')
-rw-r--r-- | drivers/opus/silk/enc_API.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/opus/silk/enc_API.c b/drivers/opus/silk/enc_API.c index 66a9bb67de..ac1a7854f0 100644 --- a/drivers/opus/silk/enc_API.c +++ b/drivers/opus/silk/enc_API.c @@ -25,20 +25,20 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS 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 "define.h" -#include "API.h" -#include "control.h" -#include "typedef.h" -#include "stack_alloc.h" -#include "structs.h" -#include "tuning_parameters.h" +#include "opus/silk/define.h" +#include "opus/silk/API.h" +#include "opus/silk/control.h" +#include "opus/silk/typedef.h" +#include "opus/celt/stack_alloc.h" +#include "opus/silk/structs.h" +#include "opus/silk/tuning_parameters.h" #ifdef OPUS_FIXED_POINT -#include "main_FIX.h" +#include "opus/silk/fixed/main_FIX.h" #else -#include "main_FLP.h" +#include "opus/silk/float/main_FLP.h" #endif /***************************************/ |