aboutsummaryrefslogtreecommitdiff
path: root/drivers/opus/celt/entenc.c
diff options
context:
space:
mode:
authorJuan Linietsky2015-11-28 20:57:23 -0300
committerJuan Linietsky2015-11-28 20:57:23 -0300
commit68aaa0f813bed1e33a55b05d70c560023a3d0c6a (patch)
tree91a4400e48eb2183d4b15ea526a2f253017fb210 /drivers/opus/celt/entenc.c
parent7aa39b7cae364347cf379bb8f216adf0a79f37c7 (diff)
parent68c56f81f9f77f1296826be382958e2ecc38826b (diff)
downloadgodot-68aaa0f813bed1e33a55b05d70c560023a3d0c6a.tar.gz
godot-68aaa0f813bed1e33a55b05d70c560023a3d0c6a.tar.zst
godot-68aaa0f813bed1e33a55b05d70c560023a3d0c6a.zip
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'drivers/opus/celt/entenc.c')
-rw-r--r--drivers/opus/celt/entenc.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/opus/celt/entenc.c b/drivers/opus/celt/entenc.c
index 299329c63..085b2b281 100644
--- a/drivers/opus/celt/entenc.c
+++ b/drivers/opus/celt/entenc.c
@@ -25,13 +25,13 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if defined(OPUS_HAVE_CONFIG_H)
-# include "opus_config.h"
+#if defined(OPUS_ENABLED)
+# include "opus/opus_config.h"
#endif
-#include "os_support.h"
-#include "arch.h"
-#include "entenc.h"
-#include "mfrngcod.h"
+#include "opus/celt/os_support.h"
+#include "opus/celt/arch.h"
+#include "opus/celt/entenc.h"
+#include "opus/celt/mfrngcod.h"
/*A range encoder.
See entdec.c and the references for implementation details \cite{Mar79,MNW98}.