From e5247b5f5716a273e7877e6f5a36a4fb796cdd75 Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Mon, 10 Mar 2003 11:22:30 +0000 Subject: [PATCH] * oooooops - sorry for this one - wrong logic empty dsp_mask - no change FORCE - add, no FORCE - enabled bits are masked out Originally committed as revision 1659 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/i386/dsputil_mmx.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libavcodec/i386/dsputil_mmx.c b/libavcodec/i386/dsputil_mmx.c index b937ef5565..a05eb9e658 100644 --- a/libavcodec/i386/dsputil_mmx.c +++ b/libavcodec/i386/dsputil_mmx.c @@ -1441,10 +1441,12 @@ void dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx) { mm_flags = mm_support(); - if (avctx->dsp_mask && FF_MM_FORCE) - mm_flags |= (avctx->dsp_mask & 0xffff); - else - mm_flags &= (avctx->dsp_mask & 0xffff); + if (avctx->dsp_mask) { + if (avctx->dsp_mask & FF_MM_FORCE) + mm_flags |= (avctx->dsp_mask & 0xffff); + else + mm_flags &= ~(avctx->dsp_mask & 0xffff); + } #if 0 fprintf(stderr, "libavcodec: CPU flags:");