[patch] new patch for mplayer on ppc64

mplayer-1.0_pre5-r4-ppc64.patch (text/plain), 2.64 KB, created by Yuta SATOH (RETIRED) on 2004-11-20 01:41:50 UTC

diff -Nur MPlayer-1.0pre5.orig/configure MPlayer-1.0pre5/configure
--- MPlayer-1.0pre5.orig/configure	2004-11-14 12:26:04.826628654 +0900
+++ MPlayer-1.0pre5/configure	2004-11-14 12:42:46.021422901 +0900
@@ -445,7 +445,7 @@
       i[3-9]86*|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686) host_arch=i386 ;;
       ia64) host_arch=ia64 ;;
       x86_64|amd64) host_arch=x86_64 ;;
-      macppc|ppc) host_arch=ppc ;;
+      macppc|ppc|ppc64) host_arch=ppc ;;
       alpha) host_arch=alpha ;;
       sparc*) host_arch=sparc ;;
       parisc*|hppa*|9000*) host_arch=hppa ;;
diff -Nur MPlayer-1.0pre5.orig/mp3lib/layer3.c MPlayer-1.0pre5/mp3lib/layer3.c
--- MPlayer-1.0pre5.orig/mp3lib/layer3.c	2004-11-20 17:44:55.327893776 +0900
+++ MPlayer-1.0pre5/mp3lib/layer3.c	2004-11-20 17:49:21.212946280 +0900
@@ -562,7 +562,7 @@
  * Dequantize samples (includes huffman decoding)
  */
 /* 24 is enough because tab13 has max. a 19 bit huffvector */
-#define BITSHIFT ((sizeof(long)-1)*8)
+#define BITSHIFT ((sizeof(int)-1)*8)
 #define REFRESH_MASK \
   while(num < BITSHIFT) { \
     mask |= ((unsigned long)getbyte())<<(BITSHIFT-num); \
@@ -579,7 +579,7 @@
   int *me;
 
   int num=getbitoffset();
-  long mask;
+  int mask;
   /* we must split this, because for num==0 the shift is undefined if you do it in one step */
   mask  = ((unsigned long) getbits(num))<<BITSHIFT;
   mask <<= 8-num;
@@ -666,7 +666,7 @@
         if(x == 15 && h->linbits) {
           max[lwin] = cb;
           REFRESH_MASK;
-          x += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits);
+          x += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits);
           num -= h->linbits+1;
           mask <<= h->linbits;
           if(mask < 0)
@@ -690,7 +690,7 @@
         if(y == 15 && h->linbits) {
           max[lwin] = cb;
           REFRESH_MASK;
-          y += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits);
+          y += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits);
           num -= h->linbits+1;
           mask <<= h->linbits;
           if(mask < 0)
@@ -844,7 +844,7 @@
         if (x == 15 && h->linbits) {
           max = cb;
 	  REFRESH_MASK;
-          x += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits);
+          x += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits);
           num -= h->linbits+1;
           mask <<= h->linbits;
           if(mask < 0)
@@ -868,7 +868,7 @@
         if (y == 15 && h->linbits) {
           max = cb;
 	  REFRESH_MASK;
-          y += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits);
+          y += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits);
           num -= h->linbits+1;
           mask <<= h->linbits;
           if(mask < 0)