diff options
author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-09-04 09:59:08 +0000 |
---|---|---|
committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-09-04 09:59:08 +0000 |
commit | 7160bb716be07254bde383b1b2298eeff6a3e641 (patch) | |
tree | f01c7a2125ba5e8bdc866a34b401bc4b9724911c /libavcodec/x86/snowdsp_mmx.c | |
parent | 55127e7b494a0221d79501867e9b81ce185ec7b8 (diff) | |
download | ffmpeg-7160bb716be07254bde383b1b2298eeff6a3e641.tar.gz |
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.
Originally committed as revision 25040 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/x86/snowdsp_mmx.c')
-rw-r--r-- | libavcodec/x86/snowdsp_mmx.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/x86/snowdsp_mmx.c b/libavcodec/x86/snowdsp_mmx.c index 96b3bf29ba..cc65b9a0c6 100644 --- a/libavcodec/x86/snowdsp_mmx.c +++ b/libavcodec/x86/snowdsp_mmx.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/cpu.h" #include "libavutil/x86_cpu.h" #include "libavcodec/avcodec.h" #include "libavcodec/snow.h" @@ -876,8 +877,8 @@ void ff_dwt_init_x86(DWTContext *c) { int mm_flags = mm_support(); - if (mm_flags & FF_MM_MMX) { - if(mm_flags & FF_MM_SSE2 & 0){ + if (mm_flags & AV_CPU_FLAG_MMX) { + if(mm_flags & AV_CPU_FLAG_SSE2 & 0){ c->horizontal_compose97i = ff_snow_horizontal_compose97i_sse2; #if HAVE_7REGS c->vertical_compose97i = ff_snow_vertical_compose97i_sse2; @@ -885,7 +886,7 @@ void ff_dwt_init_x86(DWTContext *c) c->inner_add_yblock = ff_snow_inner_add_yblock_sse2; } else{ - if(mm_flags & FF_MM_MMX2){ + if(mm_flags & AV_CPU_FLAG_MMX2){ c->horizontal_compose97i = ff_snow_horizontal_compose97i_mmx; #if HAVE_7REGS c->vertical_compose97i = ff_snow_vertical_compose97i_mmx; |