From 65e5a43e46091764cf84e6d5d1b8009e2f53afa8 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max.kellermann@gmail.com>
Date: Wed, 3 Apr 2024 22:24:28 +0200
Subject: [PATCH] decoder/List: prefer "mpg123" over "mad"

libmad hasn't been maintained for many many years, while libmpg123 is
still maintained.

Our "mad" plugin can't do streams, but MPD will automatically fall
back to "mad" (or "ffmpeg") for streams.

Closes https://github.com/MusicPlayerDaemon/MPD/issues/1954
---
 NEWS                        | 1 +
 src/decoder/DecoderList.cxx | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 1eaa866c1..54577efa4 100644
--- a/NEWS
+++ b/NEWS
@@ -31,6 +31,7 @@ ver 0.24 (not yet released)
   - ffmpeg: require FFmpeg 4.0 or later
   - ffmpeg: query supported demuxers at runtime
   - hybrid_dsd: remove
+  - mpg123: prefer over "mad"
   - opus: implement bitrate calculation
   - sidplay: require libsidplayfp (drop support for the original sidplay)
   - wavpack: require libwavpack version 5
diff --git a/src/decoder/DecoderList.cxx b/src/decoder/DecoderList.cxx
index dac240ab4..d0c59c189 100644
--- a/src/decoder/DecoderList.cxx
+++ b/src/decoder/DecoderList.cxx
@@ -40,12 +40,12 @@
 #include <string.h>
 
 constinit const struct DecoderPlugin *const decoder_plugins[] = {
-#ifdef ENABLE_MAD
-	&mad_decoder_plugin,
-#endif
 #ifdef ENABLE_MPG123
 	&mpg123_decoder_plugin,
 #endif
+#ifdef ENABLE_MAD
+	&mad_decoder_plugin,
+#endif
 #ifdef ENABLE_VORBIS_DECODER
 	&vorbis_decoder_plugin,
 #endif