diff options
| author | Colin Guthrie <pulse@colin.guthr.ie> | 2008-08-03 19:56:49 +0100 |
|---|---|---|
| committer | Colin Guthrie <pulse@colin.guthr.ie> | 2008-08-03 19:56:49 +0100 |
| commit | 5744237a066186be305be9ea3ecb3ccccadcceca (patch) | |
| tree | 6a08957a66fb308a8f1b37232d9b2d24a246e394 /src/pulsecore/modargs.c | |
| parent | b30a5d601eaffd98914ca0b9fdecd863eade0b4f (diff) | |
| parent | 04ffac57a67eee9640f248b6fab33ee8367b0eab (diff) | |
Merge branch 'master' of git://git.0pointer.de/pulseaudio
Diffstat (limited to 'src/pulsecore/modargs.c')
| -rw-r--r-- | src/pulsecore/modargs.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/pulsecore/modargs.c b/src/pulsecore/modargs.c index 5f5902c9..d257b4ce 100644 --- a/src/pulsecore/modargs.c +++ b/src/pulsecore/modargs.c @@ -322,8 +322,7 @@ int pa_modargs_get_sample_spec_and_channel_map(pa_modargs *ma, pa_sample_spec *r if (pa_modargs_get_sample_spec(ma, &ss) < 0) return -1; - if (!pa_channel_map_init_auto(&map, ss.channels, def)) - map.channels = 0; + pa_channel_map_init_extend(&map, ss.channels, def); if (pa_modargs_get_channel_map(ma, NULL, &map) < 0) return -1; |