Mercurial > libavcodec.hg
diff i386/dsputilenc_mmx.c @ 8104:0d108ec85620 libavcodec
Remove duplicated MM_* macros for CPU capabilities from dsputil.h.
Add missing one for FF_MM_ALTIVEC to avcodec.h.
Rename all the occurences of MM_* to the corresponding FF_MM_*.
author | rathann |
---|---|
date | Mon, 03 Nov 2008 18:08:00 +0000 |
parents | 915bc657348f |
children |
line wrap: on
line diff
--- a/i386/dsputilenc_mmx.c Sun Nov 02 21:51:27 2008 +0000 +++ b/i386/dsputilenc_mmx.c Mon Nov 03 18:08:00 2008 +0000 @@ -1354,12 +1354,12 @@ void dsputilenc_init_mmx(DSPContext* c, AVCodecContext *avctx) { - if (mm_flags & MM_MMX) { + if (mm_flags & FF_MM_MMX) { const int dct_algo = avctx->dct_algo; if(dct_algo==FF_DCT_AUTO || dct_algo==FF_DCT_MMX){ - if(mm_flags & MM_SSE2){ + if(mm_flags & FF_MM_SSE2){ c->fdct = ff_fdct_sse2; - }else if(mm_flags & MM_MMXEXT){ + }else if(mm_flags & FF_MM_MMXEXT){ c->fdct = ff_fdct_mmx2; }else{ c->fdct = ff_fdct_mmx; @@ -1377,7 +1377,7 @@ c->hadamard8_diff[1]= hadamard8_diff_mmx; c->pix_norm1 = pix_norm1_mmx; - c->sse[0] = (mm_flags & MM_SSE2) ? sse16_sse2 : sse16_mmx; + c->sse[0] = (mm_flags & FF_MM_SSE2) ? sse16_sse2 : sse16_mmx; c->sse[1] = sse8_mmx; c->vsad[4]= vsad_intra16_mmx; @@ -1395,7 +1395,7 @@ c->ssd_int8_vs_int16 = ssd_int8_vs_int16_mmx; - if (mm_flags & MM_MMXEXT) { + if (mm_flags & FF_MM_MMXEXT) { c->sum_abs_dctelem= sum_abs_dctelem_mmx2; c->hadamard8_diff[0]= hadamard8_diff16_mmx2; c->hadamard8_diff[1]= hadamard8_diff_mmx2; @@ -1408,7 +1408,7 @@ c->sub_hfyu_median_prediction= sub_hfyu_median_prediction_mmx2; } - if(mm_flags & MM_SSE2){ + if(mm_flags & FF_MM_SSE2){ c->get_pixels = get_pixels_sse2; c->sum_abs_dctelem= sum_abs_dctelem_sse2; c->hadamard8_diff[0]= hadamard8_diff16_sse2; @@ -1418,7 +1418,7 @@ } #ifdef HAVE_SSSE3 - if(mm_flags & MM_SSSE3){ + if(mm_flags & FF_MM_SSSE3){ if(!(avctx->flags & CODEC_FLAG_BITEXACT)){ c->try_8x8basis= try_8x8basis_ssse3; } @@ -1429,7 +1429,7 @@ } #endif - if(mm_flags & MM_3DNOW){ + if(mm_flags & FF_MM_3DNOW){ if(!(avctx->flags & CODEC_FLAG_BITEXACT)){ c->try_8x8basis= try_8x8basis_3dnow; }