diff x86/h264dsp_mmx.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.
author stefano
date Sat, 04 Sep 2010 09:59:08 +0000
parents f4355cd85faa
children 9fef0a8ddd63
line wrap: on
line diff
--- a/x86/h264dsp_mmx.c	Fri Sep 03 21:13:01 2010 +0000
+++ b/x86/h264dsp_mmx.c	Sat Sep 04 09:59:08 2010 +0000
@@ -744,7 +744,7 @@
 {
     int mm_flags = mm_support();
 
-    if (mm_flags & FF_MM_MMX) {
+    if (mm_flags & AV_CPU_FLAG_MMX) {
         c->h264_idct_dc_add=
         c->h264_idct_add= ff_h264_idct_add_mmx;
         c->h264_idct8_dc_add=
@@ -755,7 +755,7 @@
         c->h264_idct_add8      = ff_h264_idct_add8_mmx;
         c->h264_idct_add16intra= ff_h264_idct_add16intra_mmx;
 
-        if (mm_flags & FF_MM_MMX2) {
+        if (mm_flags & AV_CPU_FLAG_MMX2) {
             c->h264_idct_dc_add= ff_h264_idct_dc_add_mmx2;
             c->h264_idct8_dc_add= ff_h264_idct8_dc_add_mmx2;
             c->h264_idct_add16     = ff_h264_idct_add16_mmx2;
@@ -765,13 +765,13 @@
 
             c->h264_loop_filter_strength= h264_loop_filter_strength_mmx2;
         }
-        if(mm_flags & FF_MM_SSE2){
+        if(mm_flags & AV_CPU_FLAG_SSE2){
             c->h264_idct8_add = ff_h264_idct8_add_sse2;
             c->h264_idct8_add4= ff_h264_idct8_add4_sse2;
         }
 
 #if HAVE_YASM
-        if (mm_flags & FF_MM_MMX2){
+        if (mm_flags & AV_CPU_FLAG_MMX2){
             c->h264_v_loop_filter_chroma= ff_x264_deblock_v_chroma_mmxext;
             c->h264_h_loop_filter_chroma= ff_x264_deblock_h_chroma_mmxext;
             c->h264_v_loop_filter_chroma_intra= ff_x264_deblock_v_chroma_intra_mmxext;
@@ -800,7 +800,7 @@
             c->biweight_h264_pixels_tab[6]= ff_h264_biweight_4x4_mmx2;
             c->biweight_h264_pixels_tab[7]= ff_h264_biweight_4x2_mmx2;
 
-            if( mm_flags&FF_MM_SSE2 ){
+            if (mm_flags&AV_CPU_FLAG_SSE2) {
                 c->weight_h264_pixels_tab[0]= ff_h264_weight_16x16_sse2;
                 c->weight_h264_pixels_tab[1]= ff_h264_weight_16x8_sse2;
                 c->weight_h264_pixels_tab[2]= ff_h264_weight_8x16_sse2;
@@ -825,7 +825,7 @@
                 c->h264_idct_add16intra = ff_h264_idct_add16intra_sse2;
 #endif
             }
-            if ( mm_flags&FF_MM_SSSE3 ){
+            if (mm_flags&AV_CPU_FLAG_SSSE3) {
                 c->biweight_h264_pixels_tab[0]= ff_h264_biweight_16x16_ssse3;
                 c->biweight_h264_pixels_tab[1]= ff_h264_biweight_16x8_ssse3;
                 c->biweight_h264_pixels_tab[2]= ff_h264_biweight_8x16_ssse3;