mirror of
https://anongit.gentoo.org/git/repo/gentoo.git
synced 2025-07-21 22:53:31 +02:00
f5d4d4995d
fixed incompatible pointers removed obsolete blocked deps scrubbed patches Closes: https://bugs.gentoo.org/931661 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
30 lines
1.9 KiB
Diff
30 lines
1.9 KiB
Diff
--- musepack-tools-495/libmpcpsy/ans.c
|
|
+++ musepack-tools-495-fixed/libmpcpsy/ans.c
|
|
@@ -287,12 +287,12 @@
|
|
// for L or M, respectively
|
|
memset ( m->FIR_L, 0, sizeof m->FIR_L ); // reset FIR
|
|
memset ( m->NS_Order_L, 0, sizeof m->NS_Order_L ); // reset Flags
|
|
- FindOptimalANS ( MaxBand, MSflag, ANSspec_L, ANSspec_M, m->NS_Order_L, m->SNR_comp_L, m->FIR_L, smr.L, smr.M, m->SCF_Index_L, Transient );
|
|
+ FindOptimalANS ( MaxBand, MSflag, ANSspec_L, ANSspec_M, m->NS_Order_L, m->SNR_comp_L, m->FIR_L, smr.L, smr.M, (const void*)m->SCF_Index_L, Transient );
|
|
|
|
// for R or S, respectively
|
|
memset ( m->FIR_R, 0, sizeof m->FIR_R ); // reset FIR
|
|
memset ( m->NS_Order_R, 0, sizeof m->NS_Order_R ); // reset Flags
|
|
- FindOptimalANS ( MaxBand, MSflag, ANSspec_R, ANSspec_S, m->NS_Order_R, m->SNR_comp_R, m->FIR_R, smr.R, smr.S, m->SCF_Index_R, Transient );
|
|
+ FindOptimalANS ( MaxBand, MSflag, ANSspec_R, ANSspec_S, m->NS_Order_R, m->SNR_comp_R, m->FIR_R, smr.R, smr.S, (const void*)m->SCF_Index_R, Transient );
|
|
|
|
return;
|
|
}
|
|
--- musepack-tools-495/mpcenc/mpcenc.h
|
|
+++ musepack-tools-495-fixed/mpcenc/mpcenc.h
|
|
@@ -241,8 +241,8 @@
|
|
|
|
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 );
|
|
|