From ceb8986cfbfb4a33d09d744e0e4532ee0a4b79f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Heusipp?= <manx@openmpt.org>
Date: Thu, 15 Aug 2024 17:56:09 +0000
Subject: [PATCH] Merged revision(s) 21451 from trunk/OpenMPT: [Var] minimp3:
 Update to fork
 <https://github.com/manxorist/minimp3/releases/tag/openmpt-2024-08-15-v4>
 commit 2811a29e4115199209fe91ae5217c9c5fc611fa6 (2024-08-15). This applies
 the following pull requests: <https://github.com/lieff/minimp3/pull/127>.
 ........

git-svn-id: https://source.openmpt.org/svn/openmpt/branches/OpenMPT-1.31@21452 56274372-70c3-4bfc-bfc3-4c3a0b034d27
---
 include/minimp3/OpenMPT.txt | 5 +++--
 include/minimp3/minimp3.h   | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/include/minimp3/OpenMPT.txt b/include/minimp3/OpenMPT.txt
index d3aa4950c7..e2b1ad6dea 100644
--- a/include/minimp3/OpenMPT.txt
+++ b/include/minimp3/OpenMPT.txt
@@ -1,6 +1,6 @@
 minimp3 library from https://github.com/lieff/minimp3
-Fork https://github.com/manxorist/minimp3/releases/tag/openmpt-2024-08-15-v3
-commit 2811a29e4115199209fe91ae5217c9c5fc611fa6 (2024-08-15)
+Fork https://github.com/manxorist/minimp3/releases/tag/openmpt-2024-08-15-v4
+commit 2116754771b79347ad2f39127abace2a093c383e (2024-08-15)
 The following changes have been made:
  *  minimp3.c has been added
  *  The following pull rquests have been merged:
@@ -8,4 +8,5 @@ The following changes have been made:
      *  https://github.com/lieff/minimp3/pull/96
      *  https://github.com/lieff/minimp3/pull/97
      *  https://github.com/lieff/minimp3/pull/125
+     *  https://github.com/lieff/minimp3/pull/127
  *  all modifications are marked by /* OpenMPT */
diff --git a/include/minimp3/minimp3.h b/include/minimp3/minimp3.h
index f7f0441623..620797b875 100644
--- a/include/minimp3/minimp3.h
+++ b/include/minimp3/minimp3.h
@@ -8,6 +8,10 @@
 */
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 #define MINIMP3_MAX_SAMPLES_PER_FRAME (1152*2)
 
 typedef struct
@@ -22,10 +26,6 @@ typedef struct
     unsigned char header[4], reserv_buf[511];
 } mp3dec_t;
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 void mp3dec_init(mp3dec_t *dec);
 #ifndef MINIMP3_FLOAT_OUTPUT
 typedef int16_t mp3d_sample_t;