diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-05-03 15:23:22 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-05-03 15:23:22 +0000 |
| commit | d8fccf4d46c3751f96191b454d982c182de3e18c (patch) | |
| tree | 726a04ed2ee74f28e5b5e4fe9be24ba331fa0e4e /libmpeg2/libmpeg-0.4.1.diff | |
| parent | b096da11bab0affd22b7e6d6b61783ec64f53306 (diff) | |
| download | mpv-d8fccf4d46c3751f96191b454d982c182de3e18c.tar.bz2 mpv-d8fccf4d46c3751f96191b454d982c182de3e18c.tar.xz | |
Only compile and use libmpeg2 AltiVec code when AltiVec is available. The
AltiVec code needs -maltivec to compile, but then AltiVec instructions
appear in other places of the code causing MPlayer to sigill.
Somehow upstream libmpeg2 manages not to sigill under what appear to be
the same circumstances. Enlightenment welcome.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26657 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpeg2/libmpeg-0.4.1.diff')
| -rw-r--r-- | libmpeg2/libmpeg-0.4.1.diff | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/libmpeg2/libmpeg-0.4.1.diff b/libmpeg2/libmpeg-0.4.1.diff index 103cc20d38..b54b28a952 100644 --- a/libmpeg2/libmpeg-0.4.1.diff +++ b/libmpeg2/libmpeg-0.4.1.diff @@ -175,6 +175,17 @@ for (j = 0; j < 64; j++) decoder->quantizer_prescale[index][i][j] = k * mpeg2dec->quantizer_matrix[index][j]; +--- libmpeg2/idct.c (revision 26652) ++++ libmpeg2/idct.c (working copy) +@@ -250,7 +254,7 @@ + mpeg2_idct_mmx_init (); + } else + #endif +-#ifdef ARCH_PPC ++#ifdef HAVE_ALTIVEC + if (accel & MPEG2_ACCEL_PPC_ALTIVEC) { + mpeg2_idct_copy = mpeg2_idct_copy_altivec; + mpeg2_idct_add = mpeg2_idct_add_altivec; --- libmpeg2/idct_mmx.c 2006-06-16 20:12:26.000000000 +0200 +++ libmpeg2/idct_mmx.c 2006-06-16 20:12:50.000000000 +0200 @@ -23,7 +27,7 @@ @@ -188,6 +199,15 @@ --- libmpeg2/motion_comp.c 2006-06-16 20:12:26.000000000 +0200 +++ libmpeg2/motion_comp.c 2006-06-16 20:12:50.000000000 +0200 +@@ -46,7 +46,7 @@ + mpeg2_mc = mpeg2_mc_mmx; + else + #endif +-#ifdef ARCH_PPC ++#ifdef HAVE_ALTIVEC + if (accel & MPEG2_ACCEL_PPC_ALTIVEC) + mpeg2_mc = mpeg2_mc_altivec; + else @@ -67,6 +61,13 @@ mpeg2_mc = mpeg2_mc_vis; else |