Skip to content

Commit a61bdb6

Browse files
committed
Merged revision(s) 24387 from trunk/OpenMPT:
[Var] minimp3: Update to fork <https://github.com/manxorist/minimp3/releases/tag/openmpt-2025-11-07-v5> commit ec51f21ef59ecf6d87bdcb028fe8f76fe761e0fe (2025-11-07). This applies the following pull requests: <lieff/minimp3#132>. ........ git-svn-id: https://source.openmpt.org/svn/openmpt/branches/OpenMPT-1.30@24390 56274372-70c3-4bfc-bfc3-4c3a0b034d27
1 parent 9b26590 commit a61bdb6

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

include/minimp3/OpenMPT.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
minimp3 library from https://github.com/lieff/minimp3
2-
Fork https://github.com/manxorist/minimp3/releases/tag/openmpt-2024-08-15-v4
2+
Fork https://github.com/manxorist/minimp3/releases/tag/openmpt-2025-11-07-v5
33
commit 2116754771b79347ad2f39127abace2a093c383e (2024-08-15)
44
The following changes have been made:
55
* minimp3.c has been added
@@ -9,4 +9,5 @@ The following changes have been made:
99
* https://github.com/lieff/minimp3/pull/97
1010
* https://github.com/lieff/minimp3/pull/125
1111
* https://github.com/lieff/minimp3/pull/127
12+
* https://github.com/lieff/minimp3/pull/132
1213
* all modifications are marked by /* OpenMPT */

include/minimp3/minimp3.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ int mp3dec_decode_frame(mp3dec_t *dec, const uint8_t *mp3, int mp3_bytes, mp3d_s
8686

8787
#if !defined(MINIMP3_NO_SIMD)
8888

89-
#if !defined(MINIMP3_ONLY_SIMD) && (defined(_M_X64) || defined(__x86_64__) || defined(__aarch64__) || defined(_M_ARM64))
89+
#if !defined(MINIMP3_ONLY_SIMD) && (defined(_M_X64) || defined(__x86_64__) || defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC))
9090
/* x64 always have SSE2, arm64 always have neon, no need for generic code */
9191
#define MINIMP3_ONLY_SIMD
9292
#endif /* SIMD checks... */
@@ -161,7 +161,7 @@ static int have_simd(void)
161161
return g_have_simd - 1;
162162
#endif /* MINIMP3_ONLY_SIMD */
163163
}
164-
#elif defined(__ARM_NEON) || defined(__aarch64__) || defined(_M_ARM64)
164+
#elif defined(__ARM_NEON) || defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC)
165165
#include <arm_neon.h>
166166
#define HAVE_SSE 0
167167
#define HAVE_SIMD 1
@@ -191,7 +191,7 @@ static int have_simd(void)
191191
#define HAVE_SIMD 0
192192
#endif /* !defined(MINIMP3_NO_SIMD) */
193193

194-
#if defined(__ARM_ARCH) && (__ARM_ARCH >= 6) && !defined(__aarch64__) && !defined(_M_ARM64) && !defined(__ARM_ARCH_6M__)
194+
#if defined(__ARM_ARCH) && (__ARM_ARCH >= 6) && !defined(__aarch64__) && !defined(_M_ARM64) && !defined(_M_ARM64EC) && !defined(__ARM_ARCH_6M__)
195195
#define HAVE_ARMV6 1
196196
static __inline__ __attribute__((always_inline)) int32_t minimp3_clip_int16_arm(int32_t a)
197197
{

0 commit comments

Comments
 (0)