RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Avoid void*-arithmetic. 

Patch by mvplayer: ffmpeg gmail com

Originally committed as revision 11932 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
avcoder 2008-02-14 08:16:07 +00:00 committed by Benoit Fouet
parent 7eeebcc5de
commit 90d30570d8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavutil/mem.c
View File

@ -55,7 +55,7 @@ void *av_malloc(unsigned int size)
if(!ptr)
return ptr;
diff= ((-(long)ptr - 1)&15) + 1;
ptr += diff;
ptr = (char*)ptr + diff;
((char*)ptr)[-1]= diff;
#elif defined (HAVE_MEMALIGN)
ptr = memalign(16,size);
@ -105,7 +105,7 @@ void *av_realloc(void *ptr, unsigned int size)
//FIXME this isn't aligned correctly, though it probably isn't needed
if(!ptr) return av_malloc(size);
diff= ((char*)ptr)[-1];
return realloc(ptr - diff, size + diff) + diff;
return (char*)realloc((char*)ptr - diff, size + diff) + diff;
#else
return realloc(ptr, size);
#endif
@ -116,7 +116,7 @@ void av_free(void *ptr)
/* XXX: this test should not be needed on most libcs */
if (ptr)
#ifdef CONFIG_MEMALIGN_HACK
free(ptr - ((char*)ptr)[-1]);
free((char*)ptr - ((char*)ptr)[-1]);
#else
free(ptr);
#endif