Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(369)

Side by Side Diff: src/libFLAC/include/private/memory.h

Issue 1961133002: Update FLAC to 1.3.1 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/flac.git@master
Patch Set: build config tweaks for Windows Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/libFLAC/include/private/md5.h ('k') | src/libFLAC/include/private/metadata.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* libFLAC - Free Lossless Audio Codec library 1 /* libFLAC - Free Lossless Audio Codec library
2 * Copyright (C) 2001,2002,2003,2004,2005,2006,2007 Josh Coalson 2 * Copyright (C) 2001-2009 Josh Coalson
3 * Copyright (C) 2011-2014 Xiph.Org Foundation
3 * 4 *
4 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
6 * are met: 7 * are met:
7 * 8 *
8 * - Redistributions of source code must retain the above copyright 9 * - Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
10 * 11 *
11 * - Redistributions in binary form must reproduce the above copyright 12 * - Redistributions in binary form must reproduce the above copyright
12 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
(...skipping 25 matching lines...) Expand all
38 39
39 #include <stdlib.h> /* for size_t */ 40 #include <stdlib.h> /* for size_t */
40 41
41 #include "private/float.h" 42 #include "private/float.h"
42 #include "FLAC/ordinals.h" /* for FLAC__bool */ 43 #include "FLAC/ordinals.h" /* for FLAC__bool */
43 44
44 /* Returns the unaligned address returned by malloc. 45 /* Returns the unaligned address returned by malloc.
45 * Use free() on this address to deallocate. 46 * Use free() on this address to deallocate.
46 */ 47 */
47 void *FLAC__memory_alloc_aligned(size_t bytes, void **aligned_address); 48 void *FLAC__memory_alloc_aligned(size_t bytes, void **aligned_address);
48 FLAC__bool FLAC__memory_alloc_aligned_int32_array(unsigned elements, FLAC__int32 **unaligned_pointer, FLAC__int32 **aligned_pointer); 49 FLAC__bool FLAC__memory_alloc_aligned_int32_array(size_t elements, FLAC__int32 * *unaligned_pointer, FLAC__int32 **aligned_pointer);
49 FLAC__bool FLAC__memory_alloc_aligned_uint32_array(unsigned elements, FLAC__uint 32 **unaligned_pointer, FLAC__uint32 **aligned_pointer); 50 FLAC__bool FLAC__memory_alloc_aligned_uint32_array(size_t elements, FLAC__uint32 **unaligned_pointer, FLAC__uint32 **aligned_pointer);
50 FLAC__bool FLAC__memory_alloc_aligned_uint64_array(unsigned elements, FLAC__uint 64 **unaligned_pointer, FLAC__uint64 **aligned_pointer); 51 FLAC__bool FLAC__memory_alloc_aligned_uint64_array(size_t elements, FLAC__uint64 **unaligned_pointer, FLAC__uint64 **aligned_pointer);
51 FLAC__bool FLAC__memory_alloc_aligned_unsigned_array(unsigned elements, unsigned **unaligned_pointer, unsigned **aligned_pointer); 52 FLAC__bool FLAC__memory_alloc_aligned_unsigned_array(size_t elements, unsigned * *unaligned_pointer, unsigned **aligned_pointer);
52 #ifndef FLAC__INTEGER_ONLY_LIBRARY 53 #ifndef FLAC__INTEGER_ONLY_LIBRARY
53 FLAC__bool FLAC__memory_alloc_aligned_real_array(unsigned elements, FLAC__real * *unaligned_pointer, FLAC__real **aligned_pointer); 54 FLAC__bool FLAC__memory_alloc_aligned_real_array(size_t elements, FLAC__real **u naligned_pointer, FLAC__real **aligned_pointer);
54 #endif 55 #endif
56 void *safe_malloc_mul_2op_p(size_t size1, size_t size2);
55 57
56 #endif 58 #endif
OLDNEW
« no previous file with comments | « src/libFLAC/include/private/md5.h ('k') | src/libFLAC/include/private/metadata.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698