audio/musepack: make C types coherent to appease llvm22

ok tb@
This commit is contained in:
naddy
2026-06-02 10:40:27 +00:00
parent 7879b0c47f
commit 0e32d29c20
4 changed files with 43 additions and 1 deletions
+1 -1
View File
@@ -3,7 +3,7 @@ COMMENT = decoder, encoder and replaygain for musepack files
V = 475
DISTNAME = musepack_src_r${V}
PKGNAME = musepack-${V}
REVISION = 6
REVISION = 7
CATEGORIES = audio
HOMEPAGE = https://www.musepack.net/
@@ -0,0 +1,14 @@
Index: libmpcpsy/libmpcpsy.h
--- libmpcpsy/libmpcpsy.h.orig
+++ libmpcpsy/libmpcpsy.h
@@ -86,8 +86,8 @@ typedef struct {
float KBD2; // = -1.
// FIXME : remove this :
- int * SCF_Index_L;
- int * SCF_Index_R; // Scalefactor-index for Bitstream
+ int (* SCF_Index_L)[3];
+ int (* SCF_Index_R)[3]; // Scalefactor-index for Bitstream
} PsyModel;
@@ -0,0 +1,14 @@
Index: mpcenc/mpcenc.c
--- mpcenc/mpcenc.c.orig
+++ mpcenc/mpcenc.c
@@ -1535,8 +1535,8 @@ mainloop ( int argc, char** argv )
// initialize tables which must be initialized once and only once
- m.SCF_Index_L = (int*) e.SCF_Index_L;
- m.SCF_Index_R = (int*) e.SCF_Index_R;
+ m.SCF_Index_L = e.SCF_Index_L;
+ m.SCF_Index_R = e.SCF_Index_R;
Init_Psychoakustik (&m);
Init_FPU ();
@@ -0,0 +1,14 @@
Index: mpcenc/mpcenc.h
--- mpcenc/mpcenc.h.orig
+++ mpcenc/mpcenc.h
@@ -254,8 +254,8 @@ extern float __invSCF [128 + 6]; // tabulated s
float ISNR_Schaetzer ( const float* samples, const float comp, const int res);
float ISNR_Schaetzer_Trans ( const float* samples, const float comp, const int res);
-void QuantizeSubband ( unsigned int* qu_output, const float* input, const int res, float* errors, const int maxNsOrder );
-void QuantizeSubbandWithNoiseShaping ( unsigned int* qu_output, const float* input, const int res, float* errors, const float* FIR );
+void QuantizeSubband ( mpc_int16_t* qu_output, const float* input, const int res, float* errors, const int maxNsOrder );
+void QuantizeSubbandWithNoiseShaping ( mpc_int16_t* qu_output, const float* input, const int res, float* errors, const float* FIR );
void NoiseInjectionComp ( void );