diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 01:46:46 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 01:50:55 +0200 |
| commit | e74708f6194ef0af2bdf37e857ed232027fa46ba (patch) | |
| tree | f7b53476abeb1cc8ccbe1c49113e9722c51b7800 /libao2 | |
| parent | 2ad00b5319603b22f9b0858bb14d016f673157cb (diff) | |
| parent | cb8796857c8bd851e3b97d729af149e3f003b851 (diff) | |
| download | mpv-e74708f6194ef0af2bdf37e857ed232027fa46ba.tar.bz2 mpv-e74708f6194ef0af2bdf37e857ed232027fa46ba.tar.xz | |
Merge svn changes up to r30748
Diffstat (limited to 'libao2')
| -rw-r--r-- | libao2/ao_coreaudio.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libao2/ao_coreaudio.c b/libao2/ao_coreaudio.c index 36456f3cc6..dffab4dd2e 100644 --- a/libao2/ao_coreaudio.c +++ b/libao2/ao_coreaudio.c @@ -291,7 +291,7 @@ int b_alive; } /* Retrieve the name of the device. */ - psz_name = (char *)malloc(i_param_size); + psz_name = malloc(i_param_size); err = AudioDeviceGetProperty(devid_def, 0, 0, kAudioDevicePropertyDeviceName, &i_param_size, psz_name); @@ -513,7 +513,7 @@ static int OpenSPDIF(void) } i_streams = i_param_size / sizeof(AudioStreamID); - p_streams = (AudioStreamID *)malloc(i_param_size); + p_streams = malloc(i_param_size); if (p_streams == NULL) { ao_msg(MSGT_AO, MSGL_WARN, "out of memory\n" ); @@ -549,7 +549,7 @@ static int OpenSPDIF(void) } i_formats = i_param_size / sizeof(AudioStreamBasicDescription); - p_format_list = (AudioStreamBasicDescription *)malloc(i_param_size); + p_format_list = malloc(i_param_size); if (p_format_list == NULL) { ao_msg(MSGT_AO, MSGL_WARN, "could not malloc the memory\n" ); @@ -742,7 +742,7 @@ static int AudioDeviceSupportsDigital( AudioDeviceID i_dev_id ) } i_streams = i_param_size / sizeof(AudioStreamID); - p_streams = (AudioStreamID *)malloc(i_param_size); + p_streams = malloc(i_param_size); if (p_streams == NULL) { ao_msg(MSGT_AO,MSGL_V, "out of memory\n"); @@ -791,7 +791,7 @@ static int AudioStreamSupportsDigital( AudioStreamID i_stream_id ) } i_formats = i_param_size / sizeof(AudioStreamBasicDescription); - p_format_list = (AudioStreamBasicDescription *)malloc(i_param_size); + p_format_list = malloc(i_param_size); if (p_format_list == NULL) { ao_msg(MSGT_AO,MSGL_V, "could not malloc the memory\n" ); |