Mercurial > libavutil.hg
annotate mem.c @ 267:d363937cc410 libavutil
Reverting stray commit part II, r8156 had the base64 export patch mixed with the nutdec patch
author | lu_zero |
---|---|
date | Wed, 28 Feb 2007 03:40:23 +0000 |
parents | d1e99b40b1c9 |
children | ca3eb39d3aa2 |
rev | line source |
---|---|
82
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
1 /* |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
2 * default memory allocator for libavutil |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
3 * Copyright (c) 2002 Fabrice Bellard. |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
4 * |
116
d76a36742464
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
113
diff
changeset
|
5 * This file is part of FFmpeg. |
d76a36742464
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
113
diff
changeset
|
6 * |
d76a36742464
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
113
diff
changeset
|
7 * FFmpeg is free software; you can redistribute it and/or |
82
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
8 * modify it under the terms of the GNU Lesser General Public |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
9 * License as published by the Free Software Foundation; either |
116
d76a36742464
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
113
diff
changeset
|
10 * version 2.1 of the License, or (at your option) any later version. |
82
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
11 * |
116
d76a36742464
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
113
diff
changeset
|
12 * FFmpeg is distributed in the hope that it will be useful, |
82
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
15 * Lesser General Public License for more details. |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
16 * |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
17 * You should have received a copy of the GNU Lesser General Public |
116
d76a36742464
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
113
diff
changeset
|
18 * License along with FFmpeg; if not, write to the Free Software |
82
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
20 */ |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
21 |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
22 /** |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
23 * @file mem.c |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
24 * default memory allocator for libavutil. |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
25 */ |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
26 |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
27 #include "common.h" |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
28 |
249
d1e99b40b1c9
cosmetics: Fix another common typo, dependAnt --> dependEnt.
diego
parents:
135
diff
changeset
|
29 /* here we can use OS dependent allocation functions */ |
82
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
30 #undef malloc |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
31 #undef free |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
32 #undef realloc |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
33 |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
34 #ifdef HAVE_MALLOC_H |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
35 #include <malloc.h> |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
36 #endif |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
37 |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
38 /* you can redefine av_malloc and av_free in your project to use your |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
39 memory allocator. You do not need to suppress this file because the |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
40 linker will do it automatically */ |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
41 |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
42 /** |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
43 * Memory allocation of size byte with alignment suitable for all |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
44 * memory accesses (including vectors if available on the |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
45 * CPU). av_malloc(0) must return a non NULL pointer. |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
46 */ |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
47 void *av_malloc(unsigned int size) |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
48 { |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
49 void *ptr; |
135
ebc5bc38c1b5
rename MEMALIGN_HACK to CONFIG_MEMALIGN_HACK, use common code in configure
mru
parents:
116
diff
changeset
|
50 #ifdef CONFIG_MEMALIGN_HACK |
82
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
51 long diff; |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
52 #endif |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
53 |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
54 /* let's disallow possible ambiguous cases */ |
96
7d343463873b
revert aligned realloc() changesm this should be identical to r5784
michael
parents:
95
diff
changeset
|
55 if(size > (INT_MAX-16) ) |
82
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
56 return NULL; |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
57 |
135
ebc5bc38c1b5
rename MEMALIGN_HACK to CONFIG_MEMALIGN_HACK, use common code in configure
mru
parents:
116
diff
changeset
|
58 #ifdef CONFIG_MEMALIGN_HACK |
82
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
59 ptr = malloc(size+16); |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
60 if(!ptr) |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
61 return ptr; |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
62 diff= ((-(long)ptr - 1)&15) + 1; |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
63 ptr += diff; |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
64 ((char*)ptr)[-1]= diff; |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
65 #elif defined (HAVE_MEMALIGN) |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
66 ptr = memalign(16,size); |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
67 /* Why 64? |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
68 Indeed, we should align it: |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
69 on 4 for 386 |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
70 on 16 for 486 |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
71 on 32 for 586, PPro - k6-III |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
72 on 64 for K7 (maybe for P3 too). |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
73 Because L1 and L2 caches are aligned on those values. |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
74 But I don't want to code such logic here! |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
75 */ |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
76 /* Why 16? |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
77 because some cpus need alignment, for example SSE2 on P4, & most RISC cpus |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
78 it will just trigger an exception and the unaligned load will be done in the |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
79 exception handler or it will just segfault (SSE2 on P4) |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
80 Why not larger? because i didnt see a difference in benchmarks ... |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
81 */ |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
82 /* benchmarks with p3 |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
83 memalign(64)+1 3071,3051,3032 |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
84 memalign(64)+2 3051,3032,3041 |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
85 memalign(64)+4 2911,2896,2915 |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
86 memalign(64)+8 2545,2554,2550 |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
87 memalign(64)+16 2543,2572,2563 |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
88 memalign(64)+32 2546,2545,2571 |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
89 memalign(64)+64 2570,2533,2558 |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
90 |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
91 btw, malloc seems to do 8 byte alignment by default here |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
92 */ |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
93 #else |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
94 ptr = malloc(size); |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
95 #endif |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
96 return ptr; |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
97 } |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
98 |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
99 /** |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
100 * av_realloc semantics (same as glibc): if ptr is NULL and size > 0, |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
101 * identical to malloc(size). If size is zero, it is identical to |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
102 * free(ptr) and NULL is returned. |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
103 */ |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
104 void *av_realloc(void *ptr, unsigned int size) |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
105 { |
135
ebc5bc38c1b5
rename MEMALIGN_HACK to CONFIG_MEMALIGN_HACK, use common code in configure
mru
parents:
116
diff
changeset
|
106 #ifdef CONFIG_MEMALIGN_HACK |
96
7d343463873b
revert aligned realloc() changesm this should be identical to r5784
michael
parents:
95
diff
changeset
|
107 int diff; |
7d343463873b
revert aligned realloc() changesm this should be identical to r5784
michael
parents:
95
diff
changeset
|
108 #endif |
82
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
109 |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
110 /* let's disallow possible ambiguous cases */ |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
111 if(size > (INT_MAX-16) ) |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
112 return NULL; |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
113 |
135
ebc5bc38c1b5
rename MEMALIGN_HACK to CONFIG_MEMALIGN_HACK, use common code in configure
mru
parents:
116
diff
changeset
|
114 #ifdef CONFIG_MEMALIGN_HACK |
96
7d343463873b
revert aligned realloc() changesm this should be identical to r5784
michael
parents:
95
diff
changeset
|
115 //FIXME this isn't aligned correctly, though it probably isn't needed |
7d343463873b
revert aligned realloc() changesm this should be identical to r5784
michael
parents:
95
diff
changeset
|
116 if(!ptr) return av_malloc(size); |
7d343463873b
revert aligned realloc() changesm this should be identical to r5784
michael
parents:
95
diff
changeset
|
117 diff= ((char*)ptr)[-1]; |
7d343463873b
revert aligned realloc() changesm this should be identical to r5784
michael
parents:
95
diff
changeset
|
118 return realloc(ptr - diff, size + diff) + diff; |
7d343463873b
revert aligned realloc() changesm this should be identical to r5784
michael
parents:
95
diff
changeset
|
119 #else |
7d343463873b
revert aligned realloc() changesm this should be identical to r5784
michael
parents:
95
diff
changeset
|
120 return realloc(ptr, size); |
82
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
121 #endif |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
122 } |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
123 |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
124 /** |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
125 * Free memory which has been allocated with av_malloc(z)() or av_realloc(). |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
126 * NOTE: ptr = NULL is explicetly allowed |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
127 * Note2: it is recommended that you use av_freep() instead |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
128 */ |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
129 void av_free(void *ptr) |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
130 { |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
131 /* XXX: this test should not be needed on most libcs */ |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
132 if (ptr) |
135
ebc5bc38c1b5
rename MEMALIGN_HACK to CONFIG_MEMALIGN_HACK, use common code in configure
mru
parents:
116
diff
changeset
|
133 #ifdef CONFIG_MEMALIGN_HACK |
82
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
134 free(ptr - ((char*)ptr)[-1]); |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
135 #else |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
136 free(ptr); |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
137 #endif |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
138 } |
8fb151c4d4c7
Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil
lucabe
parents:
diff
changeset
|
139 |
113 | 140 /** |
141 * Frees memory and sets the pointer to NULL. | |
142 * @param arg pointer to the pointer which should be freed | |
143 */ | |
144 void av_freep(void *arg) | |
145 { | |
146 void **ptr= (void**)arg; | |
147 av_free(*ptr); | |
148 *ptr = NULL; | |
149 } | |
150 | |
151 void *av_mallocz(unsigned int size) | |
152 { | |
153 void *ptr; | |
154 | |
155 ptr = av_malloc(size); | |
156 if (ptr) | |
157 memset(ptr, 0, size); | |
158 return ptr; | |
159 } | |
160 | |
161 char *av_strdup(const char *s) | |
162 { | |
163 char *ptr; | |
164 int len; | |
165 len = strlen(s) + 1; | |
166 ptr = av_malloc(len); | |
167 if (ptr) | |
168 memcpy(ptr, s, len); | |
169 return ptr; | |
170 } | |
171 |