diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-02-19 01:52:46 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-02-19 01:52:46 +0000 |
| commit | 4c3d23444740a1ca1835375aa350ece7cf414d1d (patch) | |
| tree | 399d67303f3b96013238ba41b6683818e8d77302 /libmpeg2 | |
| parent | 0ac6b92ec9da57d52b2770ebe610fbb5056c8c7c (diff) | |
| download | mpv-4c3d23444740a1ca1835375aa350ece7cf414d1d.tar.bz2 mpv-4c3d23444740a1ca1835375aa350ece7cf414d1d.tar.xz | |
Update patch with missing changes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14731 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpeg2')
| -rw-r--r-- | libmpeg2/libmpeg-0.4.0.diff | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/libmpeg2/libmpeg-0.4.0.diff b/libmpeg2/libmpeg-0.4.0.diff index 1223517c4c..24d8595275 100644 --- a/libmpeg2/libmpeg-0.4.0.diff +++ b/libmpeg2/libmpeg-0.4.0.diff @@ -251,31 +251,24 @@ diff -Naur libmpeg2.orig/motion_comp.c libmpeg2/motion_comp.c if (accel & MPEG2_ACCEL_X86_MMXEXT) mpeg2_mc = mpeg2_mc_mmxext; else if (accel & MPEG2_ACCEL_X86_3DNOW) -@@ -43,20 +43,24 @@ +@@ -42,7 +42,7 @@ + mpeg2_mc = mpeg2_mc_mmx; else #endif - #ifdef ARCH_PPC -+#ifdef HAVE_ALTIVEC +-#ifdef ARCH_PPC ++#if defined(ARCH_PPC) && defined(HAVE_ALTIVEC) if (accel & MPEG2_ACCEL_PPC_ALTIVEC) mpeg2_mc = mpeg2_mc_altivec; else - #endif -+#endif - #ifdef ARCH_ALPHA - if (accel & MPEG2_ACCEL_ALPHA) +@@ -52,7 +52,7 @@ mpeg2_mc = mpeg2_mc_alpha; else #endif - #ifdef ARCH_SPARC -+#ifdef HAVE_VIS +-#ifdef ARCH_SPARC ++#if defined(ARCH_SPARC) && defined(HAVE_VIS) if (accel & MPEG2_ACCEL_SPARC_VIS) mpeg2_mc = mpeg2_mc_vis; else - #endif -+#endif - mpeg2_mc = mpeg2_mc_c; - } - diff -Naur libmpeg2.orig/motion_comp_mmx.c libmpeg2/motion_comp_mmx.c --- libmpeg2.orig/motion_comp_mmx.c 2004-11-03 17:23:30.032865976 +0100 +++ libmpeg2/motion_comp_mmx.c 2004-11-03 17:28:33.053799792 +0100 |