diff arm/dsputil_iwmmxt.c @ 12456:a5ddb39627fd libavcodec

Rename FF_MM_ symbols related to CPU features flags as AV_CPU_FLAG_ symbols, and move them from libavcodec/avcodec.h to libavutil/cpu.h.

--- a/arm/dsputil_iwmmxt.c	Fri Sep 03 21:13:01 2010 +0000
+++ b/arm/dsputil_iwmmxt.c	Sat Sep 04 09:59:08 2010 +0000
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/cpu.h"
 #include "libavcodec/dsputil.h"
 
 #define DEF(x, y) x ## _no_rnd_ ## y ##_iwmmxt
@@ -153,16 +154,16 @@
 
 void ff_dsputil_init_iwmmxt(DSPContext* c, AVCodecContext *avctx)
 {
-    int mm_flags = FF_MM_IWMMXT; /* multimedia extension flags */
+    int mm_flags = AV_CPU_FLAG_IWMMXT; /* multimedia extension flags */
 
     if (avctx->dsp_mask) {
-        if (avctx->dsp_mask & FF_MM_FORCE)
+        if (avctx->dsp_mask & AV_CPU_FLAG_FORCE)
             mm_flags |= (avctx->dsp_mask & 0xffff);
         else
             mm_flags &= ~(avctx->dsp_mask & 0xffff);
     }
 
-    if (!(mm_flags & FF_MM_IWMMXT)) return;
+    if (!(mm_flags & AV_CPU_FLAG_IWMMXT)) return;
 
     c->add_pixels_clamped = add_pixels_clamped_iwmmxt;