RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-01 23:00:41 +00:00
Code Issues Releases Wiki Activity

Update for changes from r19139 and r19137.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19264 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2006-07-30 20:03:43 +00:00
parent d01ad3b845
commit 12ee85d9c5
1 changed files with 28 additions and 9 deletions

37
libmpeg2/libmpeg-0.4.0.diff
View File

@ -192,16 +192,25 @@
{ {
int d0, d1, d2, d3; int d0, d1, d2, d3;
int a0, a1, a2, a3, b0, b1, b2, b3; int a0, a1, a2, a3, b0, b1, b2, b3;
@@ -235,7 +239,7 @@ @@ -239,12 +239,15 @@
void mpeg2_idct_init (uint32_t accel) void mpeg2_idct_init (uint32_t accel)
{ {
-#ifdef ARCH_X86 -#ifdef ARCH_X86
+#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;
@@ -254,11 +258,14 @@ 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_add = mpeg2_idct_add_mmx;
mpeg2_idct_mmx_init ();
@@ -254,11 +261,14 @@
} else } else
#endif #endif
#ifdef ARCH_ALPHA #ifdef ARCH_ALPHA
@ -266,25 +275,35 @@
--- libmpeg2/motion_comp.c 2006-06-16 20:12:26.000000000 +0200 --- libmpeg2/motion_comp.c 2006-06-16 20:12:26.000000000 +0200
+++ libmpeg2/motion_comp.c 2006-06-16 20:12:50.000000000 +0200 +++ libmpeg2/motion_comp.c 2006-06-16 20:12:50.000000000 +0200
@@ -33,7 +37,7 @@ @@ -37,16 +37,22 @@
void mpeg2_mc_init (uint32_t accel) void mpeg2_mc_init (uint32_t accel)
{ {
-#ifdef ARCH_X86 -#ifdef ARCH_X86
+#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 if (accel & MPEG2_ACCEL_X86_3DNOW)
@@ -42,7 +46,7 @@ + else
+#endif
+#ifdef HAVE_3DNOW
+ if (accel & MPEG2_ACCEL_X86_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 - elseo
+ else
#endif #endif
-#ifdef ARCH_PPC -#ifdef ARCH_PPC
+#if defined(ARCH_PPC) && defined(HAVE_ALTIVEC) +#if defined(ARCH_PPC) && defined(HAVE_ALTIVEC)
if (accel & MPEG2_ACCEL_PPC_ALTIVEC) if (accel & MPEG2_ACCEL_PPC_ALTIVEC)
mpeg2_mc = mpeg2_mc_altivec; mpeg2_mc = mpeg2_mc_altivec;
else else
@@ -52,7 +56,7 @@ @@ -52,7 +62,7 @@
mpeg2_mc = mpeg2_mc_alpha; mpeg2_mc = mpeg2_mc_alpha;
else else
#endif #endif