From 8d0e9d4662d2fefc803921a607742588c12e8367 Mon Sep 17 00:00:00 2001
From: Tanu Kaskinen <tanuk@iki.fi>
Date: Wed, 9 May 2012 06:04:52 +0300
Subject: [PATCH] modargs: Don't fail needlessly in
 pa_modargs_get_sample_spec_and_channel_map().

BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=49664
---
 src/pulsecore/modargs.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/pulsecore/modargs.c b/src/pulsecore/modargs.c
index e86ffa55..0abc2436 100644
--- a/src/pulsecore/modargs.c
+++ b/src/pulsecore/modargs.c
@@ -453,8 +453,12 @@ int pa_modargs_get_sample_spec_and_channel_map(
     if (pa_modargs_get_channel_map(ma, NULL, &map) < 0)
         return -1;
 
-    if (map.channels != ss.channels)
-        return -1;
+    if (map.channels != ss.channels) {
+        if (!pa_modargs_get_value(ma, "channels", NULL))
+            ss.channels = map.channels;
+        else
+            return -1;
+    }
 
     *rmap = map;
     *rss = ss;
-- 
2.39.2