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/armv4l | |
| 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/armv4l')
| -rw-r--r-- | libavcodec/armv4l/dsputil_arm.c | 2 | ||||
| -rw-r--r-- | libavcodec/armv4l/dsputil_iwmmxt.c | 4 | ||||
| -rw-r--r-- | libavcodec/armv4l/mpegvideo_iwmmxt.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/armv4l/dsputil_arm.c b/libavcodec/armv4l/dsputil_arm.c index 64153ad6cd..695bf1c2cf 100644 --- a/libavcodec/armv4l/dsputil_arm.c +++ b/libavcodec/armv4l/dsputil_arm.c @@ -117,7 +117,7 @@ static void simple_idct_ipp_add(uint8_t *dest, int line_size, DCTELEM *block) int mm_support(void) { - return ENABLE_IWMMXT * MM_IWMMXT; + return ENABLE_IWMMXT * FF_MM_IWMMXT; } void dsputil_init_armv4l(DSPContext* c, AVCodecContext *avctx) diff --git a/libavcodec/armv4l/dsputil_iwmmxt.c b/libavcodec/armv4l/dsputil_iwmmxt.c index 101d3ca808..3d6260b056 100644 --- a/libavcodec/armv4l/dsputil_iwmmxt.c +++ b/libavcodec/armv4l/dsputil_iwmmxt.c @@ -150,7 +150,7 @@ static void nop(uint8_t *block, const uint8_t *pixels, int line_size, int h) /* A run time test is not simple. If this file is compiled in * then we should install the functions */ -int mm_flags = MM_IWMMXT; /* multimedia extension flags */ +int mm_flags = FF_MM_IWMMXT; /* multimedia extension flags */ void dsputil_init_iwmmxt(DSPContext* c, AVCodecContext *avctx) { @@ -161,7 +161,7 @@ void dsputil_init_iwmmxt(DSPContext* c, AVCodecContext *avctx) mm_flags &= ~(avctx->dsp_mask & 0xffff); } - if (!(mm_flags & MM_IWMMXT)) return; + if (!(mm_flags & FF_MM_IWMMXT)) return; c->add_pixels_clamped = add_pixels_clamped_iwmmxt; diff --git a/libavcodec/armv4l/mpegvideo_iwmmxt.c b/libavcodec/armv4l/mpegvideo_iwmmxt.c index a6f8234d7b..e816ac67c5 100644 --- a/libavcodec/armv4l/mpegvideo_iwmmxt.c +++ b/libavcodec/armv4l/mpegvideo_iwmmxt.c @@ -110,7 +110,7 @@ static void dct_unquantize_h263_inter_iwmmxt(MpegEncContext *s, void MPV_common_init_iwmmxt(MpegEncContext *s) { - if (!(mm_flags & MM_IWMMXT)) return; + if (!(mm_flags & FF_MM_IWMMXT)) return; s->dct_unquantize_h263_intra = dct_unquantize_h263_intra_iwmmxt; #if 0 |