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/ppc | |
| 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/ppc')
| -rw-r--r-- | libavcodec/ppc/dsputil_ppc.c | 4 | ||||
| -rw-r--r-- | libavcodec/ppc/mpegvideo_altivec.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/ppc/dsputil_ppc.c b/libavcodec/ppc/dsputil_ppc.c index 1b83b0219d..443e1db3c0 100644 --- a/libavcodec/ppc/dsputil_ppc.c +++ b/libavcodec/ppc/dsputil_ppc.c @@ -50,7 +50,7 @@ int mm_support(void) int result = 0; #ifdef HAVE_ALTIVEC if (has_altivec()) { - result |= MM_ALTIVEC; + result |= FF_MM_ALTIVEC; } #endif /* result */ return result; @@ -265,7 +265,7 @@ void dsputil_init_ppc(DSPContext* c, AVCodecContext *avctx) if(ENABLE_H264_DECODER) dsputil_h264_init_ppc(c, avctx); if (has_altivec()) { - mm_flags |= MM_ALTIVEC; + mm_flags |= FF_MM_ALTIVEC; dsputil_init_altivec(c, avctx); if(ENABLE_SNOW_DECODER) snow_init_altivec(c, avctx); diff --git a/libavcodec/ppc/mpegvideo_altivec.c b/libavcodec/ppc/mpegvideo_altivec.c index 4c9ae2da36..ba1719f45e 100644 --- a/libavcodec/ppc/mpegvideo_altivec.c +++ b/libavcodec/ppc/mpegvideo_altivec.c @@ -590,7 +590,7 @@ extern void idct_add_altivec(uint8_t *dest, int line_size, int16_t *block); void MPV_common_init_altivec(MpegEncContext *s) { - if ((mm_flags & MM_ALTIVEC) == 0) return; + if ((mm_flags & FF_MM_ALTIVEC) == 0) return; if (s->avctx->lowres==0) { if ((s->avctx->idct_algo == FF_IDCT_AUTO) || |