diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-08-19 20:36:17 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-08-19 22:35:01 +0800 |
| commit | b7afbe59c42a3e6e92f712153172364f4ebaa5e2 (patch) | |
| tree | b10784783099c002ed1cc8fd694915ade40b6e67 /indra/llimagej2coj | |
| parent | 495f103000137b3288eaa05a4298fd33ceb3c2dc (diff) | |
| parent | 135fcd19541f414c3278b25b02b7bd34fbc3065f (diff) | |
Merge branch 'webrtc-voice' into 2024.06-atlasaurus
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 969bf68b6d..a64ae8e55c 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 |