summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTanu Kaskinen <tanuk@iki.fi>2012-05-09 06:04:52 +0300
committerTanu Kaskinen <tanuk@iki.fi>2012-12-19 12:31:50 +0200
commit8d0e9d4662d2fefc803921a607742588c12e8367 (patch)
tree4f090d0c4102270f5157ecaf51da9c7493f7711f
parent953bedc974df95ac434698b71e76c2066d5e8006 (diff)
modargs: Don't fail needlessly in pa_modargs_get_sample_spec_and_channel_map().
BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=49664
-rw-r--r--src/pulsecore/modargs.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/pulsecore/modargs.c b/src/pulsecore/modargs.c
index e86ffa551..0abc2436b 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;