# HG changeset patch
# User reimar
# Date 1084569360 0
# Node ID 131b6c6828634b967d3ec1115790bd484c243861
# Parent  16e673350486390c0159c04a98d2de795296e279
removed #ifdefs that are already handled by libao2/afmt.h

diff -r 16e673350486 -r 131b6c682863 libao2/afmt.c
--- a/libao2/afmt.c	Fri May 14 21:08:53 2004 +0000
+++ b/libao2/afmt.c	Fri May 14 21:16:00 2004 +0000
@@ -30,18 +30,10 @@
 	    return("MPEG (2) audio");
 	case AFMT_AC3:
 	    return("AC3");
-/*
-  the following two formats are not available with old linux kernel
-  headers (e.g. in 2.2.16)
-*/
-#ifdef AFMT_S32_LE
 	case AFMT_S32_LE:
 	    return("Signed 32-bit (Little-Endian)");
-#endif
-#ifdef AFMT_S32_BE
 	case AFMT_S32_BE:
 	    return("Signed 32-bit (Big-Endian)");
-#endif
 	case AFMT_FLOAT:
 	    return("Floating Point");
     }
@@ -58,18 +50,8 @@
 	case AFMT_U16_BE: 
 	return 16;//16 bits
 
-/*
-  the following two formats are not available with old linux kernel
-  headers (e.g. in 2.2.16)
-*/
-#ifdef AFMT_S32_LE
 	case AFMT_S32_LE:
-	return 32;
-#endif
-#ifdef AFMT_S32_BE
 	case AFMT_S32_BE:
-	return 32;
-#endif
 	case AFMT_FLOAT:
 	return 32;
 	
diff -r 16e673350486 -r 131b6c682863 libmpcodecs/dec_audio.c
--- a/libmpcodecs/dec_audio.c	Fri May 14 21:08:53 2004 +0000
+++ b/libmpcodecs/dec_audio.c	Fri May 14 21:16:00 2004 +0000
@@ -59,11 +59,7 @@
   // Set up some common usefull defaults. ad->preinit() can override these:
   
   sh_audio->samplesize=2;
-#ifdef WORDS_BIGENDIAN
-  sh_audio->sample_format=AFMT_S16_BE;
-#else
-  sh_audio->sample_format=AFMT_S16_LE;
-#endif
+  sh_audio->sample_format=AFMT_S16_NE;
   sh_audio->samplerate=0;
   sh_audio->channels=0;
   sh_audio->i_bps=0;  // input rate (bytes/sec)