10l, i broke this with my last commit. should be fixed now.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19139 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
rfelker 2006-07-19 05:47:21 +00:00
parent 408cc87d58
commit 916c35ec6b
2 changed files with 14 additions and 5 deletions

View File

@ -239,12 +239,15 @@ static void mpeg2_idct_add_c (const int last, int16_t * block,
void mpeg2_idct_init (uint32_t accel) void mpeg2_idct_init (uint32_t accel)
{ {
#if defined(ARCH_X86) || defined(ARCH_X86_64) #ifdef HAVE_MMX2
if (accel & MPEG2_ACCEL_X86_MMXEXT) { if (accel & MPEG2_ACCEL_X86_MMXEXT) {
mpeg2_idct_copy = mpeg2_idct_copy_mmxext; mpeg2_idct_copy = mpeg2_idct_copy_mmxext;
mpeg2_idct_add = mpeg2_idct_add_mmxext; mpeg2_idct_add = mpeg2_idct_add_mmxext;
mpeg2_idct_mmx_init (); mpeg2_idct_mmx_init ();
} else if (accel & MPEG2_ACCEL_X86_MMX) { } else
#endif
#ifdef HAVE_MMX
if (accel & MPEG2_ACCEL_X86_MMX) {
mpeg2_idct_copy = mpeg2_idct_copy_mmx; mpeg2_idct_copy = mpeg2_idct_copy_mmx;
mpeg2_idct_add = mpeg2_idct_add_mmx; mpeg2_idct_add = mpeg2_idct_add_mmx;
mpeg2_idct_mmx_init (); mpeg2_idct_mmx_init ();

View File

@ -37,12 +37,18 @@ mpeg2_mc_t mpeg2_mc;
void mpeg2_mc_init (uint32_t accel) void mpeg2_mc_init (uint32_t accel)
{ {
#if defined(ARCH_X86) || defined(ARCH_X86_64) #ifdef HAVE_MMX2
if (accel & MPEG2_ACCEL_X86_MMXEXT) if (accel & MPEG2_ACCEL_X86_MMXEXT)
mpeg2_mc = mpeg2_mc_mmxext; mpeg2_mc = mpeg2_mc_mmxext;
else if (accel & MPEG2_ACCEL_X86_3DNOW) else
#endif
#ifdef HAVE_3DNOW
if (accel & MPEG2_ACCEL_X86_3DNOW)
mpeg2_mc = mpeg2_mc_3dnow; mpeg2_mc = mpeg2_mc_3dnow;
else if (accel & MPEG2_ACCEL_X86_MMX) else
#endif
#ifdef HAVE_MMX
if (accel & MPEG2_ACCEL_X86_MMX)
mpeg2_mc = mpeg2_mc_mmx; mpeg2_mc = mpeg2_mc_mmx;
else else
#endif #endif