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/resampler.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/resampler.c')
| -rw-r--r-- | src/pulsecore/resampler.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/pulsecore/resampler.c b/src/pulsecore/resampler.c index 429759f0..7a93cee8 100644 --- a/src/pulsecore/resampler.c +++ b/src/pulsecore/resampler.c @@ -215,13 +215,13 @@ pa_resampler* pa_resampler_new( if (am) r->i_cm = *am; - else - pa_channel_map_init_auto(&r->i_cm, r->i_ss.channels, PA_CHANNEL_MAP_DEFAULT); + else if (!pa_channel_map_init_auto(&r->i_cm, r->i_ss.channels, PA_CHANNEL_MAP_DEFAULT)) + goto fail; if (bm) r->o_cm = *bm; - else - pa_channel_map_init_auto(&r->o_cm, r->o_ss.channels, PA_CHANNEL_MAP_DEFAULT); + else if (!pa_channel_map_init_auto(&r->o_cm, r->o_ss.channels, PA_CHANNEL_MAP_DEFAULT)) + goto fail; r->i_fz = pa_frame_size(a); r->o_fz = pa_frame_size(b); |