Attachment #44335 for bug #68112

Lines 445-451 Link Here

(-)MPlayer-1.0pre5.orig/configure (-1 / +1 lines)
445	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 ;;	445	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 ;;
446	ia64) host_arch=ia64 ;;	446	ia64) host_arch=ia64 ;;
447	x86_64\|amd64) host_arch=x86_64 ;;	447	x86_64\|amd64) host_arch=x86_64 ;;
448	macppc\|ppc) host_arch=ppc ;;	448	macppc\|ppc\|ppc64) host_arch=ppc ;;
449	alpha) host_arch=alpha ;;	449	alpha) host_arch=alpha ;;
450	sparc*) host_arch=sparc ;;	450	sparc*) host_arch=sparc ;;
451	parisc\|hppa\|9000*) host_arch=hppa ;;	451	parisc\|hppa\|9000*) host_arch=hppa ;;




 * Dequantize samples (includes huffman decoding)
 */
/* 24 is enough because tab13 has max. a 19 bit huffvector */
#define BITSHIFT ((sizeof(int)-1)*8)
#define REFRESH_MASK \
  while(num < BITSHIFT) { \
    mask |= ((unsigned long)getbyte())<<(BITSHIFT-num); \

  int *me;

  int num=getbitoffset();
  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;

        if(x == 15 && h->linbits) {
          max[lwin] = cb;
          REFRESH_MASK;
          x += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits);
          num -= h->linbits+1;
          mask <<= h->linbits;
          if(mask < 0)

        if(y == 15 && h->linbits) {
          max[lwin] = cb;
          REFRESH_MASK;
          y += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits);
          num -= h->linbits+1;
          mask <<= h->linbits;
          if(mask < 0)

        if (x == 15 && h->linbits) {
          max = cb;
	  REFRESH_MASK;
          x += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits);
          num -= h->linbits+1;
          mask <<= h->linbits;
          if(mask < 0)

        if (y == 15 && h->linbits) {
          max = cb;
	  REFRESH_MASK;
          y += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits);
          num -= h->linbits+1;
          mask <<= h->linbits;
          if(mask < 0)

Return to bug 68112

Lines 562-568 Link Here

(-)MPlayer-1.0pre5.orig/mp3lib/layer3.c (-6 / +6 lines)
562	* Dequantize samples (includes huffman decoding)	562	* Dequantize samples (includes huffman decoding)
563	*/	563	*/
564	/* 24 is enough because tab13 has max. a 19 bit huffvector */	564	/* 24 is enough because tab13 has max. a 19 bit huffvector */
565	#define BITSHIFT ((sizeof(long)-1)*8)	565	#define BITSHIFT ((sizeof(int)-1)*8)
566	#define REFRESH_MASK \	566	#define REFRESH_MASK \
567	while(num < BITSHIFT) { \	567	while(num < BITSHIFT) { \
568	mask \|= ((unsigned long)getbyte())<<(BITSHIFT-num); \	568	mask \|= ((unsigned long)getbyte())<<(BITSHIFT-num); \
Lines 579-585 Link Here
579	int *me;	579	int *me;
580		580
581	int num=getbitoffset();	581	int num=getbitoffset();
582	long mask;	582	int mask;
583	/* we must split this, because for num==0 the shift is undefined if you do it in one step */	583	/* we must split this, because for num==0 the shift is undefined if you do it in one step */
584	mask = ((unsigned long) getbits(num))<<BITSHIFT;	584	mask = ((unsigned long) getbits(num))<<BITSHIFT;
585	mask <<= 8-num;	585	mask <<= 8-num;
Lines 666-672 Link Here
666	if(x == 15 && h->linbits) {	666	if(x == 15 && h->linbits) {
667	max[lwin] = cb;	667	max[lwin] = cb;
668	REFRESH_MASK;	668	REFRESH_MASK;
669	x += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits);	669	x += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits);
670	num -= h->linbits+1;	670	num -= h->linbits+1;
671	mask <<= h->linbits;	671	mask <<= h->linbits;
672	if(mask < 0)	672	if(mask < 0)
Lines 690-696 Link Here
690	if(y == 15 && h->linbits) {	690	if(y == 15 && h->linbits) {
691	max[lwin] = cb;	691	max[lwin] = cb;
692	REFRESH_MASK;	692	REFRESH_MASK;
693	y += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits);	693	y += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits);
694	num -= h->linbits+1;	694	num -= h->linbits+1;
695	mask <<= h->linbits;	695	mask <<= h->linbits;
696	if(mask < 0)	696	if(mask < 0)
Lines 844-850 Link Here
844	if (x == 15 && h->linbits) {	844	if (x == 15 && h->linbits) {
845	max = cb;	845	max = cb;
846	REFRESH_MASK;	846	REFRESH_MASK;
847	x += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits);	847	x += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits);
848	num -= h->linbits+1;	848	num -= h->linbits+1;
849	mask <<= h->linbits;	849	mask <<= h->linbits;
850	if(mask < 0)	850	if(mask < 0)
Lines 868-874 Link Here
868	if (y == 15 && h->linbits) {	868	if (y == 15 && h->linbits) {
869	max = cb;	869	max = cb;
870	REFRESH_MASK;	870	REFRESH_MASK;
871	y += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits);	871	y += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits);
872	num -= h->linbits+1;	872	num -= h->linbits+1;
873	mask <<= h->linbits;	873	mask <<= h->linbits;
874	if(mask < 0)	874	if(mask < 0)