Commit e5247b5f authored by Zdenek Kabelac's avatar Zdenek Kabelac

* 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
parent c545ddca
...@@ -1441,10 +1441,12 @@ void dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx) ...@@ -1441,10 +1441,12 @@ void dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx)
{ {
mm_flags = mm_support(); mm_flags = mm_support();
if (avctx->dsp_mask && FF_MM_FORCE) if (avctx->dsp_mask) {
mm_flags |= (avctx->dsp_mask & 0xffff); if (avctx->dsp_mask & FF_MM_FORCE)
else mm_flags |= (avctx->dsp_mask & 0xffff);
mm_flags &= (avctx->dsp_mask & 0xffff); else
mm_flags &= ~(avctx->dsp_mask & 0xffff);
}
#if 0 #if 0
fprintf(stderr, "libavcodec: CPU flags:"); fprintf(stderr, "libavcodec: CPU flags:");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment