summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2008-10-03 17:14:02 +0200
committerLennart Poettering <lennart@poettering.net>2008-10-03 17:14:02 +0200
commitd56f3751fe234162ee71c573fd4be9086af35ea4 (patch)
tree1c9a1facc2a77e89c6d0365360d5a2344fb4f858 /src
parent891989896d8c8c2d3645933c7ff93527d4eb4a9c (diff)
treat a channel map only then as compatible with a sample spec if it is valid
Diffstat (limited to 'src')
-rw-r--r--src/pulse/channelmap.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/pulse/channelmap.c b/src/pulse/channelmap.c
index db6577ed..fd313bd3 100644
--- a/src/pulse/channelmap.c
+++ b/src/pulse/channelmap.c
@@ -569,5 +569,11 @@ int pa_channel_map_compatible(const pa_channel_map *map, const pa_sample_spec *s
pa_assert(map);
pa_assert(ss);
+ if (!pa_channel_map_valid(map))
+ return 0;
+
+ if (!pa_sample_spec_valid(ss))
+ return 0;
+
return map->channels == ss->channels;
}