diff options
| author | Måns Rullgård <mans@mansr.com> | 2007-01-27 14:10:57 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2007-01-27 14:10:57 +0000 |
| commit | 7073e9fc695e88088d80bbfc771a4642c95148dc (patch) | |
| tree | 37b15c69a26cb742f47bc2cddddd864376a341db | |
| parent | 1ac9331a8f17887d0ef1a59dd63628c0220b4655 (diff) | |
| download | ffmpeg-7073e9fc695e88088d80bbfc771a4642c95148dc.tar.gz | |
rename CMOV_IS_FAST to HAVE_FAST_CMOV and simplify configure
Originally committed as revision 7729 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rwxr-xr-x | configure | 13 | ||||
| -rw-r--r-- | libavcodec/cabac.h | 6 |
2 files changed, 8 insertions, 11 deletions
@@ -480,6 +480,7 @@ HAVE_LIST=' dev_video_bktr_ioctl_bt848_h dlfcn_h dlopen + fast_cmov freetype2 gprof imlib2 @@ -589,7 +590,7 @@ cpu="generic" powerpc_perf="no" mmx="default" cmov="no" -cmov_is_fast="no" +fast_cmov="no" armv5te="default" armv6="default" iwmmxt="default" @@ -1367,13 +1368,13 @@ if test $cpu != "generic"; then i686|pentiumpro|pentium[23]|pentium-m|athlon|athlon-tbird|athlon-4|athlon-[mx]p|athlon64|k8|opteron|athlon-fx|core2) add_cflags "-march=$cpu" cmov="yes" - cmov_is_fast="yes" + fast_cmov="yes" ;; # targets that do support conditional mov but on which it's slow pentium4|prescott|nocona) add_cflags "-march=$cpu" cmov="yes" - cmov_is_fast="no" + fast_cmov="no" ;; sparc64) add_cflags "-mcpu=v9" @@ -1859,7 +1860,7 @@ echo "big-endian $bigendian" if test $arch = "x86_32" -o $arch = "x86_64"; then echo "MMX enabled $mmx" echo "CMOV enabled $cmov" - echo "CMOV is fast $cmov_is_fast" + echo "CMOV is fast $fast_cmov" fi if test $arch = "armv4l"; then echo "ARMv5TE enabled $armv5te" @@ -1999,10 +2000,6 @@ fi if enabled mmx; then echo "#define __CPU__ 586" >> $TMPH fi -if enabled cmov_is_fast; then - echo "TARGET_CMOV_IS_FAST=yes" >> config.mak - echo "#define CMOV_IS_FAST 1" >> $TMPH -fi if enabled sdl; then echo "SDL_LIBS=`"${SDL_CONFIG}" --libs`" >> config.mak diff --git a/libavcodec/cabac.h b/libavcodec/cabac.h index 931bd23223..b990014f6b 100644 --- a/libavcodec/cabac.h +++ b/libavcodec/cabac.h @@ -462,7 +462,7 @@ static int av_always_inline get_cabac_inline(CABACContext *c, uint8_t * const st #else /* BRANCHLESS_CABAC_DECODER */ -#if defined CMOV_IS_FAST +#if defined HAVE_FAST_CMOV #define BRANCHLESS_GET_CABAC_UPDATE(ret, cabac, statep, low, lowword, range, tmp, tmpbyte)\ "mov "tmp" , %%ecx \n\t"\ "shl $17 , "tmp" \n\t"\ @@ -472,7 +472,7 @@ static int av_always_inline get_cabac_inline(CABACContext *c, uint8_t * const st "and %%ecx , "tmp" \n\t"\ "sub "tmp" , "low" \n\t"\ "xor %%ecx , "ret" \n\t" -#else /* CMOV_IS_FAST */ +#else /* HAVE_FAST_CMOV */ #define BRANCHLESS_GET_CABAC_UPDATE(ret, cabac, statep, low, lowword, range, tmp, tmpbyte)\ "mov "tmp" , %%ecx \n\t"\ "shl $17 , "tmp" \n\t"\ @@ -485,7 +485,7 @@ static int av_always_inline get_cabac_inline(CABACContext *c, uint8_t * const st "and "tmp" , %%ecx \n\t"\ "sub %%ecx , "low" \n\t"\ "xor "tmp" , "ret" \n\t" -#endif /* CMOV_IS_FAST */ +#endif /* HAVE_FAST_CMOV */ #define BRANCHLESS_GET_CABAC(ret, cabac, statep, low, lowword, range, tmp, tmpbyte)\ |