diff options
author | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2013-07-15 08:39:55 +0200 |
---|---|---|
committer | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2013-07-22 21:53:18 +0200 |
commit | 7d58c51fd6fc311c03cb1eec4d4d96b433e49095 (patch) | |
tree | fd707a5a8e94c52c54abb30f2c9cd5498777ef25 /audio/out/ao_coreaudio_properties.c | |
parent | af6ad6717fb1ef36f2dc1777ec8d46396ef4dad1 (diff) | |
download | mpv-7d58c51fd6fc311c03cb1eec4d4d96b433e49095.tar.bz2 mpv-7d58c51fd6fc311c03cb1eec4d4d96b433e49095.tar.xz |
ao_coreaudio: switch properties getters to talloc
Diffstat (limited to 'audio/out/ao_coreaudio_properties.c')
-rw-r--r-- | audio/out/ao_coreaudio_properties.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/audio/out/ao_coreaudio_properties.c b/audio/out/ao_coreaudio_properties.c index da66f8b9d3..300f27a8f0 100644 --- a/audio/out/ao_coreaudio_properties.c +++ b/audio/out/ao_coreaudio_properties.c @@ -21,6 +21,7 @@ #include "audio/out/ao_coreaudio_properties.h" #include "audio/out/ao_coreaudio_utils.h" +#include "talloc.h" OSStatus ca_get(AudioObjectID id, ca_scope scope, ca_sel selector, uint32_t size, void *data) @@ -61,7 +62,7 @@ OSStatus ca_get_ary(AudioObjectID id, ca_scope scope, ca_sel selector, err = AudioObjectGetPropertyDataSize(id, &p_addr, 0, NULL, &p_size); CHECK_CA_ERROR("can't fetch property size"); - *data = malloc(p_size); + *data = talloc_size(NULL, p_size); *elements = p_size / element_size; err = ca_get(id, scope, selector, p_size, *data); @@ -86,7 +87,7 @@ OSStatus ca_get_str(AudioObjectID id, ca_scope scope, ca_sel selector, CFStringGetMaximumSizeForEncoding( CFStringGetLength(string), CA_CFSTR_ENCODING) + 1; - *data = malloc(size); + *data = talloc_size(NULL, size); CFStringGetCString(string, *data, size, CA_CFSTR_ENCODING); CFRelease(string); coreaudio_error: |