diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-19 20:52:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-19 20:53:27 +0200 |
| commit | cabbd271a5f37042291c06b9f8bd6c641fbddfde (patch) | |
| tree | 110238d357631f95c4849d0d99d978a61b2a1ee7 /libavutil/mem.c | |
| parent | 6b9446e93296ed236d497fe3f493d8956571f888 (diff) | |
| parent | 4cc2920dd2c0ce4e64e709da4f78508e1ec9871e (diff) | |
| download | ffmpeg-cabbd271a5f37042291c06b9f8bd6c641fbddfde.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (24 commits)
flvdec: remove incomplete, disabled seeking code
mem: add support for _aligned_malloc() as found on Windows
lavc: Extend the documentation for avcodec_init_packet
flvdec: remove incomplete, disabled seeking code
http: replace atoll() with strtoll()
mpegts: remove unused/incomplete/broken seeking code
af_amix: allow float planar sample format as input
af_amix: use AVFloatDSPContext.vector_fmac_scalar()
float_dsp: add x86-optimized functions for vector_fmac_scalar()
float_dsp: Move vector_fmac_scalar() from libavcodec to libavutil
lavr: Add x86-optimized function for flt to s32 conversion
lavr: Add x86-optimized function for flt to s16 conversion
lavr: Add x86-optimized functions for s32 to flt conversion
lavr: Add x86-optimized functions for s32 to s16 conversion
lavr: Add x86-optimized functions for s16 to flt conversion
lavr: Add x86-optimized function for s16 to s32 conversion
rtpenc: Support packetizing iLBC
rtpdec: Add a depacketizer for iLBC
Implement the iLBC storage file format
mov: Support muxing/demuxing iLBC
...
Conflicts:
Changelog
configure
libavcodec/avcodec.h
libavcodec/dsputil.c
libavcodec/version.h
libavformat/movenc.c
libavformat/mpegts.c
libavformat/version.h
libavutil/mem.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/mem.c')
| -rw-r--r-- | libavutil/mem.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavutil/mem.c b/libavutil/mem.c index de22ad8db8..385ace0702 100644 --- a/libavutil/mem.c +++ b/libavutil/mem.c @@ -94,6 +94,8 @@ void *av_malloc(size_t size) if (size) //OS X on SDK 10.6 has a broken posix_memalign implementation if (posix_memalign(&ptr,ALIGN,size)) ptr = NULL; +#elif HAVE_ALIGNED_MALLOC + ptr = _aligned_malloc(size, ALIGN); #elif HAVE_MEMALIGN ptr = memalign(ALIGN,size); /* Why 64? @@ -145,6 +147,8 @@ void *av_realloc(void *ptr, size_t size) ptr= realloc((char*)ptr - diff, size + diff); if(ptr) ptr = (char*)ptr + diff; return ptr; +#elif HAVE_ALIGNED_MALLOC + return _aligned_realloc(ptr, size + !size, ALIGN); #else return realloc(ptr, size + !size); #endif @@ -170,6 +174,8 @@ void av_free(void *ptr) #if CONFIG_MEMALIGN_HACK if (ptr) free((char*)ptr - ((char*)ptr)[-1]); +#elif HAVE_ALIGNED_MALLOC + _aligned_free(ptr); #else free(ptr); #endif |