diff options
| author | Dominik Mierzejewski <dominik@rangers.eu.org> | 2008-11-03 18:08:00 +0000 |
|---|---|---|
| committer | Dominik Mierzejewski <dominik@rangers.eu.org> | 2008-11-03 18:08:00 +0000 |
| commit | 82d1605fe74a3a702a818f8ac6f3c780bf8bbea9 (patch) | |
| tree | efd7ea31bd085d342874c773ab7557727aba205e /libavcodec/i386/mpegvideo_mmx.c | |
| parent | c6eaba62e80d673f9a285378dc0cdceebe039f13 (diff) | |
| download | ffmpeg-82d1605fe74a3a702a818f8ac6f3c780bf8bbea9.tar.gz | |
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_*.
Originally committed as revision 15770 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/i386/mpegvideo_mmx.c')
| -rw-r--r-- | libavcodec/i386/mpegvideo_mmx.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/i386/mpegvideo_mmx.c b/libavcodec/i386/mpegvideo_mmx.c index 90c61be0db..406d3b8c07 100644 --- a/libavcodec/i386/mpegvideo_mmx.c +++ b/libavcodec/i386/mpegvideo_mmx.c @@ -619,7 +619,7 @@ static void denoise_dct_sse2(MpegEncContext *s, DCTELEM *block){ void MPV_common_init_mmx(MpegEncContext *s) { - if (mm_flags & MM_MMX) { + if (mm_flags & FF_MM_MMX) { const int dct_algo = s->avctx->dct_algo; s->dct_unquantize_h263_intra = dct_unquantize_h263_intra_mmx; @@ -630,7 +630,7 @@ void MPV_common_init_mmx(MpegEncContext *s) s->dct_unquantize_mpeg2_intra = dct_unquantize_mpeg2_intra_mmx; s->dct_unquantize_mpeg2_inter = dct_unquantize_mpeg2_inter_mmx; - if (mm_flags & MM_SSE2) { + if (mm_flags & FF_MM_SSE2) { s->denoise_dct= denoise_dct_sse2; } else { s->denoise_dct= denoise_dct_mmx; @@ -638,13 +638,13 @@ void MPV_common_init_mmx(MpegEncContext *s) if(dct_algo==FF_DCT_AUTO || dct_algo==FF_DCT_MMX){ #ifdef HAVE_SSSE3 - if(mm_flags & MM_SSSE3){ + if(mm_flags & FF_MM_SSSE3){ s->dct_quantize= dct_quantize_SSSE3; } else #endif - if(mm_flags & MM_SSE2){ + if(mm_flags & FF_MM_SSE2){ s->dct_quantize= dct_quantize_SSE2; - } else if(mm_flags & MM_MMXEXT){ + } else if(mm_flags & FF_MM_MMXEXT){ s->dct_quantize= dct_quantize_MMX2; } else { s->dct_quantize= dct_quantize_MMX; |