Attachment #15268 for bug #25587




			$(RPM_OPT_FLAGS)' \
		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:
#	$(MAKE)   LDFLAGS= \
#		OBJECTS='decode.o dct64.o audio_oss.o' \

Lines 48-54 Link Here

(-)getlopt.c (-2 / +2 lines)
48	if (opt->flags & 2) /* var is char /	48	if (opt->flags & 2) /* var is char /
49	((char ) opt->var) = (char) opt->value;	49	((char ) opt->var) = (char) opt->value;
50	else	50	else
51	((long ) opt->var) = opt->value;	51	((int ) opt->var) = opt->value;
52	}	52	}
53	else	53	else
54	result = opt->value ? opt->value : opt->sname;	54	result = opt->value ? opt->value : opt->sname;
Lines 62-68 Link Here
62	if (opt->flags & 2) /* var is char /	62	if (opt->flags & 2) /* var is char /
63	((char *) opt->var) = strdup(loptarg);	63	((char *) opt->var) = strdup(loptarg);
64	else	64	else
65	((long ) opt->var) = atoi(loptarg);	65	((int ) opt->var) = atoi(loptarg);
66	}	66	}
67	else	67	else
68	result = opt->value ? opt->value : opt->sname;	68	result = opt->value ? opt->value : opt->sname;




 * 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 |= getbyte()<<(BITSHIFT-num); \

  int *me;

  int num=getbitoffset();
  int mask = (int) getbits(num)<<(BITSHIFT+8-num);
  part2remain -= 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 25587

Lines 192-197 Link Here

(-)Makefile.orig (+23 lines)
192	$(RPM_OPT_FLAGS)' \	192	$(RPM_OPT_FLAGS)' \
193	mpg123-make	193	mpg123-make
194		194
		195	linux-x86_64:
		196	$(MAKE) LDFLAGS= \
		197	OBJECTS='decode.o dct64.o audio_oss.o' \
		198	CFLAGS='-O2 -Wall -DLINUX -DOSS -DUSE_MMAP \
		199	$(RPM_OPT_FLAGS)' \
		200	mpg123-make
		201
		202	linux-x86_64-esd:
		203	$(MAKE) LDFLAGS= \
		204	AUDIO_LIB='-lesd -laudiofile' \
		205	OBJECTS='decode.o dct64.o audio_esd.o' \
		206	CFLAGS='-O2 -Wall -DLINUX -DOSS -DUSE_MMAP \
		207	$(RPM_OPT_FLAGS)' \
		208	mpg123-make
		209
		210	linux-x86_64-alsa:
		211	$(MAKE) LDFLAGS= \
		212	AUDIO_LIB='-lasound' \
		213	OBJECTS='decode.o dct64.o audio_alsa.o' \
		214	CFLAGS='-O2 -Wall -DLINUX -DOSS -DUSE_MMAP \
		215	$(RPM_OPT_FLAGS)' \
		216	mpg123-make
		217
195	#linux-ppc:	218	#linux-ppc:
196	# $(MAKE) LDFLAGS= \	219	# $(MAKE) LDFLAGS= \
197	# OBJECTS='decode.o dct64.o audio_oss.o' \	220	# OBJECTS='decode.o dct64.o audio_oss.o' \

Lines 608-614 Link Here

(-)layer3.c (-6 / +6 lines)
608	* Dequantize samples (includes huffman decoding)	608	* Dequantize samples (includes huffman decoding)
609	*/	609	*/
610	/* 24 is enough because tab13 has max. a 19 bit huffvector */	610	/* 24 is enough because tab13 has max. a 19 bit huffvector */
611	#define BITSHIFT ((sizeof(long)-1)*8)	611	#define BITSHIFT ((sizeof(int)-1)*8)
612	#define REFRESH_MASK \	612	#define REFRESH_MASK \
613	while(num < BITSHIFT) { \	613	while(num < BITSHIFT) { \
614	mask \|= getbyte()<<(BITSHIFT-num); \	614	mask \|= getbyte()<<(BITSHIFT-num); \
Lines 625-631 Link Here
625	int *me;	625	int *me;
626		626
627	int num=getbitoffset();	627	int num=getbitoffset();
628	long mask = (long) getbits(num)<<(BITSHIFT+8-num);	628	int mask = (int) getbits(num)<<(BITSHIFT+8-num);
629	part2remain -= num;	629	part2remain -= num;
630		630
631	{	631	{
Lines 709-715 Link Here
709	if(x == 15 && h->linbits) {	709	if(x == 15 && h->linbits) {
710	max[lwin] = cb;	710	max[lwin] = cb;
711	REFRESH_MASK;	711	REFRESH_MASK;
712	x += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits);	712	x += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits);
713	num -= h->linbits+1;	713	num -= h->linbits+1;
714	mask <<= h->linbits;	714	mask <<= h->linbits;
715	if(mask < 0)	715	if(mask < 0)
Lines 733-739 Link Here
733	if(y == 15 && h->linbits) {	733	if(y == 15 && h->linbits) {
734	max[lwin] = cb;	734	max[lwin] = cb;
735	REFRESH_MASK;	735	REFRESH_MASK;
736	y += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits);	736	y += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits);
737	num -= h->linbits+1;	737	num -= h->linbits+1;
738	mask <<= h->linbits;	738	mask <<= h->linbits;
739	if(mask < 0)	739	if(mask < 0)
Lines 883-889 Link Here
883	if (x == 15 && h->linbits) {	883	if (x == 15 && h->linbits) {
884	max = cb;	884	max = cb;
885	REFRESH_MASK;	885	REFRESH_MASK;
886	x += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits);	886	x += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits);
887	num -= h->linbits+1;	887	num -= h->linbits+1;
888	mask <<= h->linbits;	888	mask <<= h->linbits;
889	if(mask < 0)	889	if(mask < 0)
Lines 907-913 Link Here
907	if (y == 15 && h->linbits) {	907	if (y == 15 && h->linbits) {
908	max = cb;	908	max = cb;
909	REFRESH_MASK;	909	REFRESH_MASK;
910	y += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits);	910	y += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits);
911	num -= h->linbits+1;	911	num -= h->linbits+1;
912	mask <<= h->linbits;	912	mask <<= h->linbits;
913	if(mask < 0)	913	if(mask < 0)