diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-09-27 00:08:47 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-09-27 00:08:47 +0000 |
| commit | 40b58d2a336f08fb717af9d16dbfaa9801b04772 (patch) | |
| tree | 2d801801b16ec2e3933c4937cf0ce06a0b97e37c /channels/chan_alsa.c | |
| parent | d6eedb71ef1e4d537dd196d84ebb42e759e4dd73 (diff) | |
Merged revisions 83974 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r83974 | kpfleming | 2007-09-26 16:53:03 -0700 (Wed, 26 Sep 2007) | 2 lines
avoid the weird usage of assert() in the ALSA header files that gcc 4.2 wants to complain about
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@83986 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_alsa.c')
| -rw-r--r-- | channels/chan_alsa.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c index d41dfa37c..6bc838e79 100644 --- a/channels/chan_alsa.c +++ b/channels/chan_alsa.c @@ -368,7 +368,8 @@ static snd_pcm_t *alsa_card_init(char *dev, snd_pcm_stream_t stream) ast_debug(1, "Opening device %s in %s mode\n", dev, (stream == SND_PCM_STREAM_CAPTURE) ? "read" : "write"); } - snd_pcm_hw_params_alloca(&hwparams); + hwparams = alloca(snd_pcm_hw_params_sizeof()); + memset(hwparams, 0, snd_pcm_hw_params_sizeof()); snd_pcm_hw_params_any(handle, hwparams); err = snd_pcm_hw_params_set_access(handle, hwparams, SND_PCM_ACCESS_RW_INTERLEAVED); @@ -419,7 +420,8 @@ static snd_pcm_t *alsa_card_init(char *dev, snd_pcm_stream_t stream) if (err < 0) ast_log(LOG_ERROR, "Couldn't set the new hw params: %s\n", snd_strerror(err)); - snd_pcm_sw_params_alloca(&swparams); + swparams = alloca(snd_pcm_sw_params_sizeof()); + memset(swparams, 0, snd_pcm_sw_params_sizeof()); snd_pcm_sw_params_current(handle, swparams); #if 1 |