From 172a2af982bf5bc2801225f648f1d878c048a7ce Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Wed, 26 Nov 2025 11:30:08 +0100
Subject: [PATCH] pw-cat: move optstring closer to the longopts definition

---
 src/tools/pw-cat.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/tools/pw-cat.c b/src/tools/pw-cat.c
index f70be568f..639e56da2 100644
--- a/src/tools/pw-cat.c
+++ b/src/tools/pw-cat.c
@@ -1043,16 +1043,24 @@ enum {
 	OPT_VOLUME,
 };
 
+#ifdef HAVE_PW_CAT_FFMPEG_INTEGRATION
+#define OPTIONS "hvprmdosR:P:q:aM:n:c"
+#else
+#define OPTIONS "hvprmdsR:P:q:aM:n:c"
+#endif
+
 static const struct option long_options[] = {
 	{ "help",		no_argument,	   NULL, 'h' },
 	{ "version",		no_argument,	   NULL, OPT_VERSION},
 	{ "verbose",		no_argument,	   NULL, 'v' },
 
-	{ "record",		no_argument,	   NULL, 'r' },
 	{ "playback",		no_argument,	   NULL, 'p' },
+	{ "record",		no_argument,	   NULL, 'r' },
 	{ "midi",		no_argument,	   NULL, 'm' },
 	{ "dsd",		no_argument,	   NULL, 'd' },
+#ifdef HAVE_PW_CAT_FFMPEG_INTEGRATION
 	{ "encoded",		no_argument,	   NULL, 'o' },
+#endif
 	{ "sysex",		no_argument,	   NULL, 's' },
 
 	{ "remote",		required_argument, NULL, 'R' },
@@ -2035,12 +2043,7 @@ int main(int argc, char *argv[])
 		goto error_no_props;
 	}
 
-#ifdef HAVE_PW_CAT_FFMPEG_INTEGRATION
-	while ((c = getopt_long(argc, argv, "hvprmdosR:q:P:aM:n:c", long_options, NULL)) != -1) {
-#else
-	while ((c = getopt_long(argc, argv, "hvprmdsR:q:P:aM:n:c", long_options, NULL)) != -1) {
-#endif
-
+	while ((c = getopt_long(argc, argv, OPTIONS, long_options, NULL)) != -1) {
 		switch (c) {
 
 		case 'h':