Merge remote-tracking branch 'mpg123/master' into master-with-github-ci

madebr · Feb 8, 2024 · 31b10db · 31b10db
2 parents ca345d3 + e84ddcc
commit 31b10db
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/NEWS b/NEWS
@@ -6,6 +6,8 @@
 -- CMake port links libsyn123 with libm now (bug 370).
 - libmpg123:
 -- Fix --enable-portable (no usage of LFS_WRAP_NONE, bug 368).
+-- Fix dct36 wrapper usage for x86-64 and NEON. Stupid (bug 367) and
+   also avoid returning void.
 
 1.32.4
 ------

diff --git a/src/libmpg123/layer3.c b/src/libmpg123/layer3.c
@@ -1466,7 +1466,7 @@ static void INT123_dct36(real *inbuf,real *o1,real *o2,const real *wintab,real *
 #define DCT36_WRAP(asmfunc) \
 static void asmfunc ## _wrap(real *inbuf,real *o1,real *o2,const real *wintab,real *tsbuf) \
 { \
-	return asmfunc(inbuf, o1, o2, wintab, tsbuf); \
+	asmfunc(inbuf, o1, o2, wintab, tsbuf); \
 }
 
 #ifdef OPT_SSE
@@ -1529,22 +1529,22 @@ void INT123_dct36_choose(mpg123_handle *fr)
 #endif
 #ifdef OPT_AVX
 	case avx:
-		fr->cpu_opts.the_dct36 = INT123_dct36_avx;
+		fr->cpu_opts.the_dct36 = INT123_dct36_avx_wrap;
 	break;
 #endif
 #ifdef OPT_X86_64
 	case x86_64:
-		fr->cpu_opts.the_dct36 = INT123_dct36_x86_64;
+		fr->cpu_opts.the_dct36 = INT123_dct36_x86_64_wrap;
 	break;
 #endif
 #ifdef OPT_NEON
 	case neon:
-		fr->cpu_opts.the_dct36 = INT123_dct36_neon;
+		fr->cpu_opts.the_dct36 = INT123_dct36_neon_wrap;
 	break;
 #endif
 #ifdef OPT_NEON64
 	case neon:
-		fr->cpu_opts.the_dct36 = INT123_dct36_neon64;
+		fr->cpu_opts.the_dct36 = INT123_dct36_neon64_wrap;
 	break;
 #endif
 	default: