# HG changeset patch # User reimar # Date 1236964360 0 # Node ID ccbde3575f0a75fddda7538ac03bf712af270ee7 # Parent 6cc8cc259dc1fff8cc3c2f4ad7be547a48f221b7 Check for HAVE_EBX_AVAILABLE before enabling MMX code that needs the EBX register. Makes things a bit simpler for everyone who insists on compiling MPlayer as PIE-code. diff -r 6cc8cc259dc1 -r ccbde3575f0a libmpcodecs/vf_decimate.c --- a/libmpcodecs/vf_decimate.c Fri Mar 13 17:09:39 2009 +0000 +++ b/libmpcodecs/vf_decimate.c Fri Mar 13 17:12:40 2009 +0000 @@ -19,7 +19,7 @@ int max, last, cnt; }; -#if HAVE_MMX +#if HAVE_MMX && HAVE_EBX_AVAILABLE static int diff_MMX(unsigned char *old, unsigned char *new, int os, int ns) { volatile short out[4]; @@ -164,7 +164,7 @@ p->frac = 0.33; if (args) sscanf(args, "%d:%d:%d:%f", &p->max, &p->hi, &p->lo, &p->frac); diff = diff_C; -#if HAVE_MMX +#if HAVE_MMX && HAVE_EBX_AVAILABLE if(gCpuCaps.hasMMX) diff = diff_MMX; #endif return 1; diff -r 6cc8cc259dc1 -r ccbde3575f0a libmpcodecs/vf_divtc.c --- a/libmpcodecs/vf_divtc.c Fri Mar 13 17:09:39 2009 +0000 +++ b/libmpcodecs/vf_divtc.c Fri Mar 13 17:12:40 2009 +0000 @@ -33,7 +33,7 @@ * diff_MMX and diff_C stolen from vf_decimate.c */ -#if HAVE_MMX +#if HAVE_MMX && HAVE_EBX_AVAILABLE static int diff_MMX(unsigned char *old, unsigned char *new, int os, int ns) { volatile short out[4]; @@ -683,7 +683,7 @@ goto nomem; diff = diff_C; -#if HAVE_MMX +#if HAVE_MMX && HAVE_EBX_AVAILABLE if(gCpuCaps.hasMMX) diff = diff_MMX; #endif