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-input.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-input.c')
| -rw-r--r-- | src/pulsecore/sink-input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pulsecore/sink-input.c b/src/pulsecore/sink-input.c index ec0914ec..07ddb83a 100644 --- a/src/pulsecore/sink-input.c +++ b/src/pulsecore/sink-input.c @@ -120,7 +120,7 @@ pa_sink_input* pa_sink_input_new( if (data->sink->channel_map.channels == data->sample_spec.channels) data->channel_map = data->sink->channel_map; else - pa_channel_map_init_auto(&data->channel_map, data->sample_spec.channels, PA_CHANNEL_MAP_DEFAULT); + pa_return_null_if_fail(pa_channel_map_init_auto(&data->channel_map, data->sample_spec.channels, PA_CHANNEL_MAP_DEFAULT)); } pa_return_null_if_fail(pa_channel_map_valid(&data->channel_map)); |