[Mplayer-cvslog] CVS: main/libao2 afmt.c,1.4,1.5

Reimar Döffinger CVS syncmail at mplayerhq.hu
Fri May 14 23:16:02 CEST 2004


CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main/libao2
In directory mail:/var2/tmp/cvs-serv29141/libao2

Modified Files:
	afmt.c 
Log Message:
removed #ifdefs that are already handled by libao2/afmt.h


Index: afmt.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/afmt.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- afmt.c	17 Nov 2002 17:35:31 -0000	1.4
+++ afmt.c	14 May 2004 21:16:00 -0000	1.5
@@ -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;
 	




More information about the MPlayer-cvslog mailing list