[OMPT-svn-commit] OpenMPT r21452 - in branches/OpenMPT-1.31: . include/minimp3

[<sv...@op...>]

Author: manx
Date: Thu Aug 15 19:56:09 2024
New Revision: 21452
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21452

Log:
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>.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/include/minimp3/OpenMPT.txt
   branches/OpenMPT-1.31/include/minimp3/minimp3.h

Modified: branches/OpenMPT-1.31/include/minimp3/OpenMPT.txt
==============================================================================
--- branches/OpenMPT-1.31/include/minimp3/OpenMPT.txt	Thu Aug 15 19:55:47 2024	(r21451)
+++ branches/OpenMPT-1.31/include/minimp3/OpenMPT.txt	Thu Aug 15 19:56:09 2024	(r21452)
@@ -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 @@
      *  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 */

Modified: branches/OpenMPT-1.31/include/minimp3/minimp3.h
==============================================================================
--- branches/OpenMPT-1.31/include/minimp3/minimp3.h	Thu Aug 15 19:55:47 2024	(r21451)
+++ branches/OpenMPT-1.31/include/minimp3/minimp3.h	Thu Aug 15 19:56:09 2024	(r21452)
@@ -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 @@
     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;