diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-08-14 20:59:49 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-08-14 20:59:49 +0800 |
| commit | 2d4b9cf9854fa8928f4dd16d7acc24f9aa4f70e9 (patch) | |
| tree | b28c89df68d2bbf1090e979b7a5c2a32b293bead /indra/llimagej2coj | |
| parent | ce8cb73ac37ce59a76c3ebfa684e8f1c94e8fd13 (diff) | |
| parent | d831010b59d83fccc64d00c48d13447bfcbb7bcd (diff) | |
Merge branch 'main' into webrtc-voice
Diffstat (limited to 'indra/llimagej2coj')
| -rw-r--r-- | indra/llimagej2coj/llimagej2coj.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/indra/llimagej2coj/llimagej2coj.cpp b/indra/llimagej2coj/llimagej2coj.cpp index b5f1df5507..5b03f76d32 100644 --- a/indra/llimagej2coj/llimagej2coj.cpp +++ b/indra/llimagej2coj/llimagej2coj.cpp @@ -28,15 +28,9 @@ #include "llimagej2coj.h" // this is defined so that we get static linking. -#if LL_LINUX || !LL_USESYSTEMLIBS -#include "openjpeg/openjpeg.h" -#include "openjpeg/event.h" -#include "openjpeg/cio.h" -#else #include <openjpeg-2.5/openjpeg.h> #include <openjpeg-2.5/event.h> #include <openjpeg-2.5/cio.h> -#endif #define MAX_ENCODED_DISCARD_LEVELS 5 |