| Index: src/libFLAC/include/private/memory.h
|
| diff --git a/src/libFLAC/include/private/memory.h b/src/libFLAC/include/private/memory.h
|
| index 7852c815085e39ae9beffcbda0664cfc862784f2..c9f27129e7a666975c1e0aed78b0dd1b2102b673 100644
|
| --- a/src/libFLAC/include/private/memory.h
|
| +++ b/src/libFLAC/include/private/memory.h
|
| @@ -1,5 +1,6 @@
|
| /* libFLAC - Free Lossless Audio Codec library
|
| - * Copyright (C) 2001,2002,2003,2004,2005,2006,2007 Josh Coalson
|
| + * Copyright (C) 2001-2009 Josh Coalson
|
| + * Copyright (C) 2011-2014 Xiph.Org Foundation
|
| *
|
| * Redistribution and use in source and binary forms, with or without
|
| * modification, are permitted provided that the following conditions
|
| @@ -45,12 +46,13 @@
|
| * Use free() on this address to deallocate.
|
| */
|
| void *FLAC__memory_alloc_aligned(size_t bytes, void **aligned_address);
|
| -FLAC__bool FLAC__memory_alloc_aligned_int32_array(unsigned elements, FLAC__int32 **unaligned_pointer, FLAC__int32 **aligned_pointer);
|
| -FLAC__bool FLAC__memory_alloc_aligned_uint32_array(unsigned elements, FLAC__uint32 **unaligned_pointer, FLAC__uint32 **aligned_pointer);
|
| -FLAC__bool FLAC__memory_alloc_aligned_uint64_array(unsigned elements, FLAC__uint64 **unaligned_pointer, FLAC__uint64 **aligned_pointer);
|
| -FLAC__bool FLAC__memory_alloc_aligned_unsigned_array(unsigned elements, unsigned **unaligned_pointer, unsigned **aligned_pointer);
|
| +FLAC__bool FLAC__memory_alloc_aligned_int32_array(size_t elements, FLAC__int32 **unaligned_pointer, FLAC__int32 **aligned_pointer);
|
| +FLAC__bool FLAC__memory_alloc_aligned_uint32_array(size_t elements, FLAC__uint32 **unaligned_pointer, FLAC__uint32 **aligned_pointer);
|
| +FLAC__bool FLAC__memory_alloc_aligned_uint64_array(size_t elements, FLAC__uint64 **unaligned_pointer, FLAC__uint64 **aligned_pointer);
|
| +FLAC__bool FLAC__memory_alloc_aligned_unsigned_array(size_t elements, unsigned **unaligned_pointer, unsigned **aligned_pointer);
|
| #ifndef FLAC__INTEGER_ONLY_LIBRARY
|
| -FLAC__bool FLAC__memory_alloc_aligned_real_array(unsigned elements, FLAC__real **unaligned_pointer, FLAC__real **aligned_pointer);
|
| +FLAC__bool FLAC__memory_alloc_aligned_real_array(size_t elements, FLAC__real **unaligned_pointer, FLAC__real **aligned_pointer);
|
| #endif
|
| +void *safe_malloc_mul_2op_p(size_t size1, size_t size2);
|
|
|
| #endif
|
|
|