From 381934985a238b6d78357e511fc2cc40c4709dab Mon Sep 17 00:00:00 2001
From: latex <latex@disroot.org>
Date: Fri, 12 May 2023 00:25:08 +0200
Subject: [PATCH] reorder ffmpeg to be lower priority than gme
This should prevent ffmpeg from taking priority over the gme plugin.
The ffmpeg plugin is more buggy than gme.
One of the prominent bugs of preferring ffmpeg over gme is that ffmpeg
cannot seek SAP files while gme can. This should prevent that from
happening.
---
NEWS | 1 +
src/decoder/DecoderList.cxx | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/NEWS b/NEWS
index 41c2a23fe..69d88b777 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ ver 0.23.13 (not yet released)
* archive
- zzip: fix crash bug
* decoder
+ - ffmpeg: reorder to a lower priority than "gme"
- gme: require GME 0.6 or later
* output
- pipewire: fix corruption bug due to missing lock
diff --git a/src/decoder/DecoderList.cxx b/src/decoder/DecoderList.cxx
index b1cb25aff..965380089 100644
--- a/src/decoder/DecoderList.cxx
+++ b/src/decoder/DecoderList.cxx
@@ -114,11 +114,11 @@ constexpr const struct DecoderPlugin *decoder_plugins[] = {
#ifdef ENABLE_ADPLUG
&adplug_decoder_plugin,
#endif
-#ifdef ENABLE_FFMPEG
- &ffmpeg_decoder_plugin,
-#endif
#ifdef ENABLE_GME
&gme_decoder_plugin,
+#endif
+#ifdef ENABLE_FFMPEG
+ &ffmpeg_decoder_plugin,
#endif
&pcm_decoder_plugin,
nullptr