[FFmpeg-cvslog] avcodec/x86/dsputil_init: fix cpu flag checks
Michael Niedermayer
git at videolan.org
Tue Oct 15 01:48:22 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Oct 15 01:35:47 2013 +0200| [1bf8fa75ee148f40938d47bb9aaf53ac3c1ae126] | committer: Michael Niedermayer
avcodec/x86/dsputil_init: fix cpu flag checks
Fixes linking failure with --disable-sse2
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1bf8fa75ee148f40938d47bb9aaf53ac3c1ae126
---
libavcodec/x86/dsputil_init.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/x86/dsputil_init.c b/libavcodec/x86/dsputil_init.c
index df7918a..616cffc 100644
--- a/libavcodec/x86/dsputil_init.c
+++ b/libavcodec/x86/dsputil_init.c
@@ -693,12 +693,12 @@ av_cold void ff_dsputil_init_x86(DSPContext *c, AVCodecContext *avctx)
c->idct = ff_simple_idct_mmx;
c->idct_permutation_type = FF_SIMPLE_IDCT_PERM;
} else if (idct_algo == FF_IDCT_XVIDMMX) {
- if (cpu_flags & AV_CPU_FLAG_SSE2) {
+ if (X86_SSE2(cpu_flags)) {
c->idct_put = ff_idct_xvid_sse2_put;
c->idct_add = ff_idct_xvid_sse2_add;
c->idct = ff_idct_xvid_sse2;
c->idct_permutation_type = FF_SSE2_IDCT_PERM;
- } else if (cpu_flags & AV_CPU_FLAG_MMXEXT) {
+ } else if (X86_MMXEXT(cpu_flags)) {
c->idct_put = ff_idct_xvid_mmxext_put;
c->idct_add = ff_idct_xvid_mmxext_add;
c->idct = ff_idct_xvid_mmxext;
More information about the ffmpeg-cvslog
mailing list