diff options
author | Lennart Poettering <lennart@poettering.net> | 2008-03-27 23:29:32 +0000 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2008-03-27 23:29:32 +0000 |
commit | b79c6b6bc0546f6e1c3b032f67d244c68ba20808 (patch) | |
tree | 6d26fec76fe6a3d708a7c8025feee23289accc3c /src/pulsecore/sink.c | |
parent | b0a20498dbdaf0af981f5351b6295a33a3fa7121 (diff) |
merge r2105 from trunk
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/prepare-0.9.10@2159 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/pulsecore/sink.c')
-rw-r--r-- | src/pulsecore/sink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c index fcc91cb1..9adb6097 100644 --- a/src/pulsecore/sink.c +++ b/src/pulsecore/sink.c @@ -73,7 +73,7 @@ pa_sink* pa_sink_new( pa_return_null_if_fail(pa_sample_spec_valid(spec)); if (!map) - map = pa_channel_map_init_auto(&tmap, spec->channels, PA_CHANNEL_MAP_DEFAULT); + pa_return_null_if_fail((map = pa_channel_map_init_auto(&tmap, spec->channels, PA_CHANNEL_MAP_DEFAULT))); pa_return_null_if_fail(map && pa_channel_map_valid(map)); pa_return_null_if_fail(map->channels == spec->channels); |