[Mplayer-cvslog] CVS: main/libaf af_mp.c,1.6,1.7

[Alex Beregszaszi]

CVS change done by Alex Beregszaszi

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

Modified Files:
	af_mp.c 
Log Message:
make use of new defines: 24 and 32bit integer types

Index: af_mp.c
===================================================================
RCS file: /cvsroot/mplayer/main/libaf/af_mp.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- af_mp.c	25 Jun 2004 19:01:56 -0000	1.6
+++ af_mp.c	4 Oct 2004 19:50:40 -0000	1.7
@@ -18,10 +18,22 @@
     ofmt = AF_FORMAT_LE|AF_FORMAT_US; break;
   case(AFMT_U16_BE):	
     ofmt = AF_FORMAT_BE|AF_FORMAT_US; break;
+  case(AFMT_S24_LE):
+    ofmt = AF_FORMAT_LE|AF_FORMAT_SI; break;
+  case(AFMT_S24_BE):	
+    ofmt = AF_FORMAT_BE|AF_FORMAT_SI; break;
+  case(AFMT_U24_LE):
+    ofmt = AF_FORMAT_LE|AF_FORMAT_US; break;
+  case(AFMT_U24_BE):	
+    ofmt = AF_FORMAT_BE|AF_FORMAT_US; break;
   case(AFMT_S32_LE):
     ofmt = AF_FORMAT_LE|AF_FORMAT_SI; break;
   case(AFMT_S32_BE):	
     ofmt = AF_FORMAT_BE|AF_FORMAT_SI; break;
+  case(AFMT_U32_LE):
+    ofmt = AF_FORMAT_LE|AF_FORMAT_US; break;
+  case(AFMT_U32_BE):	
+    ofmt = AF_FORMAT_BE|AF_FORMAT_US; break;
   case(AFMT_IMA_ADPCM):
     ofmt = AF_FORMAT_IMA_ADPCM; break;
   case(AFMT_MU_LAW):
@@ -58,6 +70,7 @@
         switch(fmt->bps){
           case 1: return AFMT_S8;
           case 2: return (fmt->format&AF_FORMAT_LE) ? AFMT_S16_LE : AFMT_S16_BE;
+          case 3: return (fmt->format&AF_FORMAT_LE) ? AFMT_S24_LE : AFMT_S24_BE;
           case 4: return (fmt->format&AF_FORMAT_LE) ? AFMT_S32_LE : AFMT_S32_BE;
 	}
       } else {
@@ -65,7 +78,8 @@
         switch(fmt->bps){
           case 1: return AFMT_U8;
           case 2: return (fmt->format&AF_FORMAT_LE) ? AFMT_U16_LE : AFMT_U16_BE;
-//          case 4: return (fmt->format&AF_FORMAT_LE) ? AFMT_U32_LE : AFMT_U32_BE;
+          case 3: return (fmt->format&AF_FORMAT_LE) ? AFMT_U24_LE : AFMT_U24_BE;
+          case 4: return (fmt->format&AF_FORMAT_LE) ? AFMT_U32_LE : AFMT_U32_BE;
 	}
       }
     } else {