summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <[email protected]>2009-04-09 21:53:48 +0000
committerMichael Niedermayer <[email protected]>2009-04-09 21:53:48 +0000
commitcfe675269bf44c49590e9076b5d2cd2503804f98 (patch)
treeb4e1612012a848dbc2a09de74d65868d002d5200
parent2b12317a90fb45ea0f8db8d50c55238ab286c625 (diff)
Do not use SSE2 SAD for snow as it requires more alignment than can be
easily provided. Fixes issue315. Originally committed as revision 18404 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/x86/motion_est_mmx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/x86/motion_est_mmx.c b/libavcodec/x86/motion_est_mmx.c
index e61a1ba4e5..4673ebc853 100644
--- a/libavcodec/x86/motion_est_mmx.c
+++ b/libavcodec/x86/motion_est_mmx.c
@@ -455,7 +455,7 @@ void dsputil_init_pix_mmx(DSPContext* c, AVCodecContext *avctx)
c->pix_abs[1][3] = sad8_xy2_mmx2;
}
}
- if ((mm_flags & FF_MM_SSE2) && !(mm_flags & FF_MM_3DNOW)) {
+ if ((mm_flags & FF_MM_SSE2) && !(mm_flags & FF_MM_3DNOW) && avctx->codec_id != CODEC_ID_SNOW) {
c->sad[0]= sad16_sse2;
}
}