Browse Source

10l (gcc 2.95 fix)

Originally committed as revision 3827 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Michael Niedermayer 21 years ago
parent
commit
d5f121e2a5
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      libavcodec/mem.c

+ 2
- 2
libavcodec/mem.c View File

@@ -45,13 +45,13 @@
void *av_malloc(unsigned int size)
{
void *ptr;
int diff;

/* lets disallow possible ambiguous cases */
if(size > INT_MAX)
return NULL;
#ifdef MEMALIGN_HACK
int diff;
ptr = malloc(size+16+1);
diff= ((-(int)ptr - 1)&15) + 1;
ptr += diff;
@@ -97,13 +97,13 @@ void *av_malloc(unsigned int size)
*/
void *av_realloc(void *ptr, unsigned int size)
{
int diff;
/* lets disallow possible ambiguous cases */
if(size > INT_MAX)
return NULL;

#ifdef MEMALIGN_HACK
//FIXME this isnt aligned correctly though it probably isnt needed
int diff;
if(!ptr) return av_malloc(size);
diff= ((char*)ptr)[-1];
return realloc(ptr - diff, size + diff) + diff;


Loading…
Cancel
Save