diff options
Diffstat (limited to 'libmpeg2')
| -rw-r--r-- | libmpeg2/attributes.h | 4 | ||||
| -rw-r--r-- | libmpeg2/cpu_state.c | 2 | ||||
| -rw-r--r-- | libmpeg2/idct.c | 2 | ||||
| -rw-r--r-- | libmpeg2/idct_alpha.c | 4 | ||||
| -rw-r--r-- | libmpeg2/libmpeg-0.4.1.diff | 23 | ||||
| -rw-r--r-- | libmpeg2/motion_comp.c | 2 |
6 files changed, 24 insertions, 13 deletions
diff --git a/libmpeg2/attributes.h b/libmpeg2/attributes.h index cbaf2c0e2a..eefbc0dd1b 100644 --- a/libmpeg2/attributes.h +++ b/libmpeg2/attributes.h @@ -19,10 +19,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * Modified for use with MPlayer, see libmpeg-0.4.1.diff for the exact changes. - * detailed changelog at http://svn.mplayerhq.hu/mplayer/trunk/ - * $Id$ */ /* use gcc attribs to align critical data structures */ diff --git a/libmpeg2/cpu_state.c b/libmpeg2/cpu_state.c index 1ef77b7cea..52cb08b80c 100644 --- a/libmpeg2/cpu_state.c +++ b/libmpeg2/cpu_state.c @@ -47,7 +47,7 @@ static void state_restore_mmx (cpu_state_t * state) } #endif -#if defined(ARCH_PPC) && defined(HAVE_ALTIVEC) +#ifdef ARCH_PPC #if defined(__APPLE_CC__) /* apple */ #define LI(a,b) "li r" #a "," #b "\n\t" #define STVX0(a,b,c) "stvx v" #a ",0,r" #c "\n\t" diff --git a/libmpeg2/idct.c b/libmpeg2/idct.c index 530e10c9b0..80b84527da 100644 --- a/libmpeg2/idct.c +++ b/libmpeg2/idct.c @@ -254,7 +254,7 @@ void mpeg2_idct_init (uint32_t accel) 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; diff --git a/libmpeg2/idct_alpha.c b/libmpeg2/idct_alpha.c index 71328fae8f..007185bf18 100644 --- a/libmpeg2/idct_alpha.c +++ b/libmpeg2/idct_alpha.c @@ -20,10 +20,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * Modified for use with MPlayer, see libmpeg-0.4.1.diff for the exact changes. - * detailed changelog at http://svn.mplayerhq.hu/mplayer/trunk/ - * $Id$ */ #include "config.h" diff --git a/libmpeg2/libmpeg-0.4.1.diff b/libmpeg2/libmpeg-0.4.1.diff index a523582559..b54b28a952 100644 --- a/libmpeg2/libmpeg-0.4.1.diff +++ b/libmpeg2/libmpeg-0.4.1.diff @@ -95,8 +95,7 @@ @@ -48,18 +48,18 @@ #endif --#ifdef ARCH_PPC -+#if defined(ARCH_PPC) && defined(HAVE_ALTIVEC) + #ifdef ARCH_PPC -#ifdef HAVE_ALTIVEC_H /* gnu */ -#define LI(a,b) "li " #a "," #b "\n\t" -#define STVX0(a,b,c) "stvx " #a ",0," #c "\n\t" @@ -176,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 @@ @@ -189,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 diff --git a/libmpeg2/motion_comp.c b/libmpeg2/motion_comp.c index 7099b2d957..a8232c9fa3 100644 --- a/libmpeg2/motion_comp.c +++ b/libmpeg2/motion_comp.c @@ -46,7 +46,7 @@ void mpeg2_mc_init (uint32_t accel) 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 |