View | Details | Raw Unified
Collapse All | Expand All

(-) Makefile.orig (+23 lines)
 Lines 192-197    Link Here  
			$(RPM_OPT_FLAGS)' \
			$(RPM_OPT_FLAGS)' \
		mpg123-make
		mpg123-make

            

              
              
linux-x86_64:

            

            

              
              
	$(MAKE) LDFLAGS= \

            

            

              
              
		OBJECTS='decode.o dct64.o audio_oss.o' \

            

            

              
              
		CFLAGS='-O2 -Wall -DLINUX -DOSS -DUSE_MMAP \

            

            

              
              
			$(RPM_OPT_FLAGS)' \

            

            

              
              
		mpg123-make

            

            

              
              

            

            

              
              
linux-x86_64-esd:

            

            

              
              
	$(MAKE) LDFLAGS= \

            

            

              
              
		AUDIO_LIB='-lesd -laudiofile' \

            

            

              
              
		OBJECTS='decode.o dct64.o audio_esd.o' \

            

            

              
              
		CFLAGS='-O2 -Wall -DLINUX -DOSS -DUSE_MMAP \

            

            

              
              
			$(RPM_OPT_FLAGS)' \

            

            

              
              
		mpg123-make

            

            

              
              

            

            

              
              
linux-x86_64-alsa:

            

            

              
              
	$(MAKE) LDFLAGS= \

            

            

              
              
		AUDIO_LIB='-lasound' \

            

            

              
              
		OBJECTS='decode.o dct64.o audio_alsa.o' \

            

            

              
              
		CFLAGS='-O2 -Wall -DLINUX -DOSS -DUSE_MMAP \

            

            

              
              
			$(RPM_OPT_FLAGS)' \

            

            

              
              
		mpg123-make

            

            

              
              

            

        
#linux-ppc:
#linux-ppc:

        
#	$(MAKE)   LDFLAGS= \
#	$(MAKE)   LDFLAGS= \

        
#		OBJECTS='decode.o dct64.o audio_oss.o' \
#		OBJECTS='decode.o dct64.o audio_oss.o' \



(-) getlopt.c
      (-2 / +2 lines)




  

    

    

       Lines 48-54
       
    
  Link Here 
    

  

        
			if (opt->flags & 2) /* var is *char */
			if (opt->flags & 2) /* var is *char */

        
				*((char *) opt->var) = (char) opt->value;
				*((char *) opt->var) = (char) opt->value;

        
			else
			else

            

              
				*((long *) opt->var) = opt->value;

              
				*((int *) opt->var) = opt->value;

            

        
		}
		}

        
		else
		else

        
			result = opt->value ? opt->value : opt->sname;
			result = opt->value ? opt->value : opt->sname;

  

    

    

       Lines 62-68
       
    
  Link Here 
    

  

        
			if (opt->flags & 2) /* var is *char */
			if (opt->flags & 2) /* var is *char */

        
				*((char **) opt->var) = strdup(loptarg);
				*((char **) opt->var) = strdup(loptarg);

        
			else
			else

            

              
				*((long *) opt->var) = atoi(loptarg);

              
				*((int *) opt->var) = atoi(loptarg);

            

        
		}
		}

        
		else
		else

        
			result = opt->value ? opt->value : opt->sname;
			result = opt->value ? opt->value : opt->sname;



(-) layer3.c
      (-6 / +6 lines)




  

    

    

       Lines 608-614
       
    
  Link Here 
    

  

        
 * Dequantize samples (includes huffman decoding)
 * Dequantize samples (includes huffman decoding)

        
 */
 */

        
/* 24 is enough because tab13 has max. a 19 bit huffvector */
/* 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 \
#define REFRESH_MASK \

        
  while(num < BITSHIFT) { \
  while(num < BITSHIFT) { \

        
    mask |= getbyte()<<(BITSHIFT-num); \
    mask |= getbyte()<<(BITSHIFT-num); \

  

    

    

       Lines 625-631
       
    
  Link Here 
    

  

        
  int *me;
  int *me;

        

        
  int num=getbitoffset();
  int num=getbitoffset();

            

              
  long mask = (long) getbits(num)<<(BITSHIFT+8-num);

              
  int mask = (int) getbits(num)<<(BITSHIFT+8-num);

            

        
  part2remain -= num;
  part2remain -= num;

        

        
  {
  {

  

    

    

       Lines 709-715
       
    
  Link Here 
    

  

        
        if(x == 15 && h->linbits) {
        if(x == 15 && h->linbits) {

        
          max[lwin] = cb;
          max[lwin] = cb;

        
          REFRESH_MASK;
          REFRESH_MASK;

            

              
          x += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits);

              
          x += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits);

            

        
          num -= h->linbits+1;
          num -= h->linbits+1;

        
          mask <<= h->linbits;
          mask <<= h->linbits;

        
          if(mask < 0)
          if(mask < 0)

  

    

    

       Lines 733-739
       
    
  Link Here 
    

  

        
        if(y == 15 && h->linbits) {
        if(y == 15 && h->linbits) {

        
          max[lwin] = cb;
          max[lwin] = cb;

        
          REFRESH_MASK;
          REFRESH_MASK;

            

              
          y += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits);

              
          y += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits);

            

        
          num -= h->linbits+1;
          num -= h->linbits+1;

        
          mask <<= h->linbits;
          mask <<= h->linbits;

        
          if(mask < 0)
          if(mask < 0)

  

    

    

       Lines 883-889
       
    
  Link Here 
    

  

        
        if (x == 15 && h->linbits) {
        if (x == 15 && h->linbits) {

        
          max = cb;
          max = cb;

        
	  REFRESH_MASK;
	  REFRESH_MASK;

            

              
          x += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits);

              
          x += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits);

            

        
          num -= h->linbits+1;
          num -= h->linbits+1;

        
          mask <<= h->linbits;
          mask <<= h->linbits;

        
          if(mask < 0)
          if(mask < 0)

  

    

    

       Lines 907-913
       
    
  Link Here 
    

  

        
        if (y == 15 && h->linbits) {
        if (y == 15 && h->linbits) {

        
          max = cb;
          max = cb;

        
	  REFRESH_MASK;
	  REFRESH_MASK;

            

              
          y += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits);

              
          y += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits);

            

        
          num -= h->linbits+1;
          num -= h->linbits+1;

        
          mask <<= h->linbits;
          mask <<= h->linbits;

        
          if(mask < 0)
          if(mask < 0)