[MPlayer-cvslog] CVS: main/libaf af_mp.c,1.7,1.8

[Sascha Sommer CVS]

CVS change done by Sascha Sommer CVS

Update of /cvsroot/mplayer/main/libaf
In directory mail:/var2/tmp/cvs-serv27338/libaf

Modified Files:
	af_mp.c 
Log Message:
1000l (probably not all of al3x's changes in there yet)

Index: af_mp.c
===================================================================
RCS file: /cvsroot/mplayer/main/libaf/af_mp.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- af_mp.c	4 Oct 2004 19:50:40 -0000	1.7
+++ af_mp.c	19 Dec 2004 20:28:54 -0000	1.8
@@ -7,33 +7,33 @@
   // Check input ifmt
   switch(ifmt){
   case(AFMT_U8):
-    ofmt = AF_FORMAT_LE|AF_FORMAT_US; break;
+    ofmt = AF_FORMAT_U8; break;
   case(AFMT_S8):
-    ofmt = AF_FORMAT_LE|AF_FORMAT_SI; break;
+    ofmt = AF_FORMAT_S8; break;
   case(AFMT_S16_LE):
-    ofmt = AF_FORMAT_LE|AF_FORMAT_SI; break;
+    ofmt = AF_FORMAT_S16_LE; break;
   case(AFMT_S16_BE):
-    ofmt = AF_FORMAT_BE|AF_FORMAT_SI; break;
+    ofmt = AF_FORMAT_S16_BE; break;
   case(AFMT_U16_LE):	
-    ofmt = AF_FORMAT_LE|AF_FORMAT_US; break;
+    ofmt = AF_FORMAT_U16_LE; break;
   case(AFMT_U16_BE):	
-    ofmt = AF_FORMAT_BE|AF_FORMAT_US; break;
+    ofmt = AF_FORMAT_U16_BE; break;
   case(AFMT_S24_LE):
-    ofmt = AF_FORMAT_LE|AF_FORMAT_SI; break;
+    ofmt = AF_FORMAT_S24_LE; break;
   case(AFMT_S24_BE):	
-    ofmt = AF_FORMAT_BE|AF_FORMAT_SI; break;
+    ofmt = AF_FORMAT_S24_BE; break;
   case(AFMT_U24_LE):
-    ofmt = AF_FORMAT_LE|AF_FORMAT_US; break;
+    ofmt = AF_FORMAT_U24_LE; break;
   case(AFMT_U24_BE):	
-    ofmt = AF_FORMAT_BE|AF_FORMAT_US; break;
+    ofmt = AF_FORMAT_U24_BE; break;
   case(AFMT_S32_LE):
-    ofmt = AF_FORMAT_LE|AF_FORMAT_SI; break;
+    ofmt = AF_FORMAT_S32_LE; break;
   case(AFMT_S32_BE):	
-    ofmt = AF_FORMAT_BE|AF_FORMAT_SI; break;
+    ofmt = AF_FORMAT_S32_BE; break;
   case(AFMT_U32_LE):
-    ofmt = AF_FORMAT_LE|AF_FORMAT_US; break;
+    ofmt = AF_FORMAT_U32_LE; break;
   case(AFMT_U32_BE):	
-    ofmt = AF_FORMAT_BE|AF_FORMAT_US; break;
+    ofmt = AF_FORMAT_U32_BE; break;
   case(AFMT_IMA_ADPCM):
     ofmt = AF_FORMAT_IMA_ADPCM; break;
   case(AFMT_MU_LAW):
@@ -45,8 +45,8 @@
   case(AFMT_AC3):
     ofmt = AF_FORMAT_AC3; break;
   case(AFMT_FLOAT):
-    ofmt = AF_FORMAT_F | AF_FORMAT_NE; break;
-  default: 
+    ofmt = AF_FORMAT_FLOAT; break;
+  default:
     if ((ifmt & AFMT_AF_FLAGS) == AFMT_AF_FLAGS) {
       ofmt = ifmt & ~AFMT_AF_FLAGS;
       break;
@@ -64,7 +64,7 @@
   af_data_t* fmt=(af_data_t*) fmtp;
   switch(fmt->format&AF_FORMAT_SPECIAL_MASK){
   case 0: // PCM:
-    if((fmt->format&AF_FORMAT_POINT_MASK)==AF_FORMAT_I){
+    if(fmt->format&AF_FORMAT_I){
       if((fmt->format&AF_FORMAT_SIGN_MASK)==AF_FORMAT_SI){
         // signed int PCM:
         switch(fmt->bps){