RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-22 07:20:45 +00:00
Code Issues Projects Releases Wiki Activity

rename MEMALIGN_HACK to CONFIG_MEMALIGN_HACK, use common code in configure

Browse Source 
Originally committed as revision 7025 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård 2006-11-14 00:35:21 +00:00
parent 4416111893
commit 9ddbcae667
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure vendored
View File

@ -353,7 +353,7 @@ require(){
check_lib $header $func "$@" || die "ERROR: $name not found" check_lib $header $func "$@" || die "ERROR: $name not found"
} }
CONFIG_LIST='encoders decoders parsers muxers demuxers a52 a52bin amr amr_nb amr_nb_fixed amr_wb audio_beos audio_oss avisynth beos_netserver bktr dc1394 dts dv1394 faac faad faadbin ffmpeg ffplay ffserver gpl ipv6 libgsm libnut libogg libvorbis mp3lame mpegaudio_hp network pp protocols swscaler vhook video4linux video4linux2 x264 xvid zlib' CONFIG_LIST='encoders decoders parsers muxers demuxers a52 a52bin amr amr_nb amr_nb_fixed amr_wb audio_beos audio_oss avisynth beos_netserver bktr dc1394 dts dv1394 faac faad faadbin ffmpeg ffplay ffserver gpl ipv6 libgsm libnut libogg libvorbis memalign_hack mp3lame mpegaudio_hp network pp protocols swscaler vhook video4linux video4linux2 x264 xvid zlib'
HAVE_LIST='altivec_h byteswap_h dcbzl dlfcn dlopen freetype2 gprof imlib2 localtime_r lrintf malloc_h memalign mlib sdl sdl_video_size' HAVE_LIST='altivec_h byteswap_h dcbzl dlfcn dlopen freetype2 gprof imlib2 localtime_r lrintf malloc_h memalign mlib sdl sdl_video_size'
@ -528,7 +528,7 @@ mlib="no"
pthreads="no" pthreads="no"
swscaler="no" swscaler="no"
gpl="no" gpl="no"
memalignhack="no" memalign_hack="no"
asmalign_pot="unknown" asmalign_pot="unknown"
LIB_INSTALL_EXTRA_CMD='$(RANLIB) "$(libdir)/$(LIB)"' LIB_INSTALL_EXTRA_CMD='$(RANLIB) "$(libdir)/$(LIB)"'
@ -888,7 +888,7 @@ for opt do
;; ;;
--enable-gpl) gpl="yes" --enable-gpl) gpl="yes"
;; ;;
--enable-memalign-hack) memalignhack="yes" --enable-memalign-hack) memalign_hack="yes"
;; ;;
--disable-strip) dostrip="no" --disable-strip) dostrip="no"
;; ;;
@ -1341,7 +1341,7 @@ if check_header malloc.h; then
fi fi
if test "$memalign" = "no" -a "$mmx" = "yes" -a \ if test "$memalign" = "no" -a "$mmx" = "yes" -a \
"$memalignhack" != "yes" -a "$targetos" != "Darwin" -a \ "$memalign_hack" != "yes" -a "$targetos" != "Darwin" -a \
"$targetos" != "FreeBSD" ; then "$targetos" != "FreeBSD" ; then
die "Error, no memalign() but SSE enabled, disable it or use --enable-memalign-hack." die "Error, no memalign() but SSE enabled, disable it or use --enable-memalign-hack."
fi fi
@ -1936,10 +1936,6 @@ if test "$targetos" = "Darwin"; then
echo "CONFIG_DARWIN=yes" >> config.mak echo "CONFIG_DARWIN=yes" >> config.mak
fi fi
if test "$memalignhack" = "yes" ; then
echo "#define MEMALIGN_HACK 1" >> $TMPH
fi
if test "$need_inet_aton" = "yes" ; then if test "$need_inet_aton" = "yes" ; then
echo "NEED_INET_ATON=yes" >> config.mak echo "NEED_INET_ATON=yes" >> config.mak
fi fi

10
libavutil/mem.c
View File

@ -47,7 +47,7 @@
void *av_malloc(unsigned int size) void *av_malloc(unsigned int size)
{ {
void *ptr; void *ptr;
#ifdef MEMALIGN_HACK #ifdef CONFIG_MEMALIGN_HACK
long diff; long diff;
#endif #endif
@ -55,7 +55,7 @@ void *av_malloc(unsigned int size)
if(size > (INT_MAX-16) ) if(size > (INT_MAX-16) )
return NULL; return NULL;
#ifdef MEMALIGN_HACK #ifdef CONFIG_MEMALIGN_HACK
ptr = malloc(size+16); ptr = malloc(size+16);
if(!ptr) if(!ptr)
return ptr; return ptr;
@ -103,7 +103,7 @@ void *av_malloc(unsigned int size)
*/ */
void *av_realloc(void *ptr, unsigned int size) void *av_realloc(void *ptr, unsigned int size)
{ {
#ifdef MEMALIGN_HACK #ifdef CONFIG_MEMALIGN_HACK
int diff; int diff;
#endif #endif
@ -111,7 +111,7 @@ void *av_realloc(void *ptr, unsigned int size)
if(size > (INT_MAX-16) ) if(size > (INT_MAX-16) )
return NULL; return NULL;
#ifdef MEMALIGN_HACK #ifdef CONFIG_MEMALIGN_HACK
//FIXME this isn't aligned correctly, though it probably isn't needed //FIXME this isn't aligned correctly, though it probably isn't needed
if(!ptr) return av_malloc(size); if(!ptr) return av_malloc(size);
diff= ((char*)ptr)[-1]; diff= ((char*)ptr)[-1];
@ -130,7 +130,7 @@ void av_free(void *ptr)
{ {
/* XXX: this test should not be needed on most libcs */ /* XXX: this test should not be needed on most libcs */
if (ptr) if (ptr)
#ifdef MEMALIGN_HACK #ifdef CONFIG_MEMALIGN_HACK
free(ptr - ((char*)ptr)[-1]); free(ptr - ((char*)ptr)[-1]);
#else #else
free(ptr); free(ptr);