# HG changeset patch
# User gb
# Date 1262596772 0
# Node ID 78c2be62260adaa25ed09b8fbfac3e098e188390
# Parent  8963dc7bb92387002f8b6bc867e3f1c85b6921f2
Fix XvMC. XvMCCreateBlocks() may not allocate 16-byte aligned blocks,
so we can't use SSE-optimized routines.

diff -r 8963dc7bb923 -r 78c2be62260a x86/dsputil_mmx.c
--- a/x86/dsputil_mmx.c	Sun Jan 03 21:21:41 2010 +0000
+++ b/x86/dsputil_mmx.c	Mon Jan 04 09:19:32 2010 +0000
@@ -2596,7 +2596,9 @@
         c->add_pixels_clamped = add_pixels_clamped_mmx;
         c->clear_block  = clear_block_mmx;
         c->clear_blocks = clear_blocks_mmx;
-        if (mm_flags & FF_MM_SSE){
+        if ((mm_flags & FF_MM_SSE) &&
+            !(CONFIG_MPEG_XVMC_DECODER && avctx->xvmc_acceleration > 1)){
+            /* XvMCCreateBlocks() may not allocate 16-byte aligned blocks */
             c->clear_block  = clear_block_sse;
             c->clear_blocks = clear_blocks_sse;
         }