aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDieter <freebsd@sopwith.solgatos.com>2006-01-30 22:59:09 +0000
committerMåns Rullgård <mans@mansr.com>2006-01-30 22:59:09 +0000
commited96aeea640f2454a17299ef7e0f4c9a8915a46d (patch)
tree9e22623abcc8403754ce1ae06f63a4ef5878c92f
parent6569497442e6fc39397a28cc40e8d7b03fc8c818 (diff)
downloadffmpeg-ed96aeea640f2454a17299ef7e0f4c9a8915a46d.tar.gz
long is better than int for pointer differences
patch by Dieter <freebsd at sopwith solgatos com> Originally committed as revision 4911 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/mem.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mem.c b/libavcodec/mem.c
index 141da270b1..24d75e9483 100644
--- a/libavcodec/mem.c
+++ b/libavcodec/mem.c
@@ -46,7 +46,7 @@ void *av_malloc(unsigned int size)
{
void *ptr;
#ifdef MEMALIGN_HACK
- int diff;
+ long diff;
#endif
/* lets disallow possible ambiguous cases */
@@ -55,7 +55,7 @@ void *av_malloc(unsigned int size)
#ifdef MEMALIGN_HACK
ptr = malloc(size+16+1);
- diff= ((-(int)ptr - 1)&15) + 1;
+ diff= ((-(long)ptr - 1)&15) + 1;
ptr += diff;
((char*)ptr)[-1]= diff;
#elif defined (HAVE_MEMALIGN)