summaryrefslogtreecommitdiff
path: root/libavcodec/x86/mpegvideo.c
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2013-08-20 14:46:58 +0200
committerDiego Biurrun <diego@biurrun.de>2013-08-29 13:07:37 +0200
commit6369ba3c9cc74becfaad2a8882dff3dd3e7ae3c0 (patch)
tree24a69c3793e5791b75d5e7b421583ddfda1f7b44 /libavcodec/x86/mpegvideo.c
parent79aec43ce813a3e270743ca64fa3f31fa43df80b (diff)
x86: avcodec: Use convenience macros to check for CPU flags
Diffstat (limited to 'libavcodec/x86/mpegvideo.c')
-rw-r--r--libavcodec/x86/mpegvideo.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/x86/mpegvideo.c b/libavcodec/x86/mpegvideo.c
index 2289a6dcc1..caf1e3a96d 100644
--- a/libavcodec/x86/mpegvideo.c
+++ b/libavcodec/x86/mpegvideo.c
@@ -22,6 +22,7 @@
#include "libavutil/attributes.h"
#include "libavutil/cpu.h"
#include "libavutil/x86/asm.h"
+#include "libavutil/x86/cpu.h"
#include "libavcodec/avcodec.h"
#include "libavcodec/mpegvideo.h"
#include "dsputil_x86.h"
@@ -559,7 +560,7 @@ av_cold void ff_MPV_common_init_x86(MpegEncContext *s)
#if HAVE_INLINE_ASM
int cpu_flags = av_get_cpu_flags();
- if (cpu_flags & AV_CPU_FLAG_MMX) {
+ if (INLINE_MMX(cpu_flags)) {
s->dct_unquantize_h263_intra = dct_unquantize_h263_intra_mmx;
s->dct_unquantize_h263_inter = dct_unquantize_h263_inter_mmx;
s->dct_unquantize_mpeg1_intra = dct_unquantize_mpeg1_intra_mmx;
@@ -567,8 +568,7 @@ av_cold void ff_MPV_common_init_x86(MpegEncContext *s)
if(!(s->flags & CODEC_FLAG_BITEXACT))
s->dct_unquantize_mpeg2_intra = dct_unquantize_mpeg2_intra_mmx;
s->dct_unquantize_mpeg2_inter = dct_unquantize_mpeg2_inter_mmx;
-
- if (cpu_flags & AV_CPU_FLAG_SSE2) {
+ if (INLINE_SSE2(cpu_flags)) {
s->denoise_dct= denoise_dct_sse2;
} else {
s->denoise_dct= denoise_dct_mmx;