--- MPlayer-cvs/libaf/af_format.c	2003-01-18 18:31:58.000000000 +0100
+++ MPlayer-test/libaf/af_format.c	2004-04-28 21:32:48.000000000 +0200
@@ -131,9 +131,9 @@
 // Sanity check for bytes per sample
 int check_bps(int bps)
 {
-  if(bps != 4 && bps != 2 && bps != 1){
+  if(bps != 4 && bps != 3 && bps != 2 && bps != 1){
     af_msg(AF_MSG_ERROR,"[format] The number of bytes per sample" 
-	   " must be 1, 2 or 4. Current value is %i \n",bps);
+	   " must be 1, 2, 3 or 4. Current value is %i \n",bps);
     return AF_ERROR;
   }
   return AF_OK;
@@ -362,6 +362,15 @@
       }
       break;
     }
+    case(3):{
+      register uint8_t s;
+      for(i=0;i<len;i++){
+	s=((uint8_t*)in)[3*i];
+	((uint8_t*)out)[3*i]=((uint8_t*)in)[3*i+2];
+	((uint8_t*)out)[3*i+2]=s;
+      }
+      break;
+    }
     case(4):{
       register uint32_t s;
       for(i=0;i<len;i++){
@@ -388,6 +397,31 @@
     for(i=0;i<len;i++)
       ((uint16_t*)out)[i]=(uint16_t)(SHRT_MAX+((int)((int16_t*)in)[i]));
     break;
+  case(3):
+    for(i=0;i<len;i++) {
+      register int32_t s;
+      register uint32_t r;
+#if WORDS_BIGENDIAN
+      s=(((int32_t)((uint8_t*)in)[3*i])<<16) |
+	(((int32_t)((uint8_t*)in)[3*i+1])<<8) |
+	(((int32_t)((uint8_t*)in)[3*i+2]));
+#else
+      s=(((int32_t)((uint8_t*)in)[3*i])) |
+	(((int32_t)((uint8_t*)in)[3*i+1])<<8) |
+	(((int32_t)((uint8_t*)in)[3*i+2])<<16);
+#endif
+      r=(uint32_t)(INT_MAX+s);
+#if WORDS_BIGENDIAN
+      ((uint8_t*)out)[3*i]=(r&0x00FF0000)>>16;
+      ((uint8_t*)out)[3*i+1]=(r&0x0000FF00)>>8;
+      ((uint8_t*)out)[3*i+2]=r&0x000000FF;
+#else
+      ((uint8_t*)out)[3*i]=r&0x000000FF;
+      ((uint8_t*)out)[3*i+1]=(r&0x0000FF00)>>8;
+      ((uint8_t*)out)[3*i+2]=(r&0x00FF0000)>>16;
+#endif
+    }
+    break;
   case(4):
     for(i=0;i<len;i++)
       ((uint32_t*)out)[i]=(uint32_t)(INT_MAX+((int32_t*)in)[i]);
@@ -407,6 +441,31 @@
     for(i=0;i<len;i++)
       ((int16_t*)out)[i]=(int16_t)(SHRT_MIN+((int)((uint16_t*)in)[i]));
     break;
+  case(3):
+    for(i=0;i<len;i++) {
+      register uint32_t s;
+      register int32_t r;
+#if WORDS_BIGENDIAN
+      s=(((uint32_t)((uint8_t*)in)[3*i])<<16) |
+	(((uint32_t)((uint8_t*)in)[3*i+1])<<8) |
+	(((uint32_t)((uint8_t*)in)[3*i+2]));
+#else
+      s=(((uint32_t)((uint8_t*)in)[3*i])) |
+	(((uint32_t)((uint8_t*)in)[3*i+1])<<8) |
+	(((uint32_t)((uint8_t*)in)[3*i+2])<<16);
+#endif
+      r=(int32_t)(INT_MIN+s);
+#if WORDS_BIGENDIAN
+      ((uint8_t*)out)[3*i]=(r&0x00FF0000)>>16;
+      ((uint8_t*)out)[3*i+1]=(r&0x0000FF00)>>8;
+      ((uint8_t*)out)[3*i+2]=r&0x000000FF;
+#else
+      ((uint8_t*)out)[3*i]=r&0x000000FF;
+      ((uint8_t*)out)[3*i+1]=(r&0x0000FF00)>>8;
+      ((uint8_t*)out)[3*i+2]=(r&0x00FF0000)>>16;
+#endif
+    }
+    break;
   case(4):
     for(i=0;i<len;i++)
       ((int32_t*)out)[i]=(int32_t)(INT_MIN+((uint32_t*)in)[i]);
@@ -424,6 +483,19 @@
       for(i=0;i<len;i++)
 	((uint16_t*)out)[i]=((uint16_t)((uint8_t*)in)[i])<<8;
       break;
+    case(3):
+      for(i=0;i<len;i++) {
+#if WORDS_BIGENDIAN
+	((uint8_t*)out)[3*i]=((uint8_t*)in)[i];
+	((uint8_t*)out)[3*i+1]=0;
+	((uint8_t*)out)[3*i+2]=0;
+#else
+	((uint8_t*)out)[3*i]=0;
+	((uint8_t*)out)[3*i+1]=0;
+	((uint8_t*)out)[3*i+2]=((uint8_t*)in)[i];
+#endif
+      }
+      break;
     case(4):
       for(i=0;i<len;i++)
 	((uint32_t*)out)[i]=((uint32_t)((uint8_t*)in)[i])<<24;
@@ -436,12 +508,62 @@
       for(i=0;i<len;i++)
 	((uint8_t*)out)[i]=(uint8_t)((((uint16_t*)in)[i])>>8);
       break;
+    case(3):
+      for(i=0;i<len;i++) {
+#if WORDS_BIGENDIAN
+	((uint8_t*)out)[3*i]=((uint8_t*)in)[2*i];
+	((uint8_t*)out)[3*i+1]=((uint8_t*)in)[2*i+1];
+	((uint8_t*)out)[3*i+2]=0;
+#else
+	((uint8_t*)out)[3*i]=0;
+	((uint8_t*)out)[3*i+1]=((uint8_t*)in)[2*i];
+	((uint8_t*)out)[3*i+2]=((uint8_t*)in)[2*i+1];
+#endif
+      }
+      break;
     case(4):
       for(i=0;i<len;i++)
 	((uint32_t*)out)[i]=((uint32_t)((uint16_t*)in)[i])<<16;
       break;
     }
     break;
+  case(3):
+    switch(outbps){
+    case(1):
+      for(i=0;i<len;i++) {
+#if WORDS_BIGENDIAN
+	((uint8_t*)out)[i]=((uint8_t*)in)[3*i];
+#else
+	((uint8_t*)out)[i]=((uint8_t*)in)[3*i+2];
+#endif
+      }
+      break;
+    case(2):
+      for(i=0;i<len;i++) {
+#if WORDS_BIGENDIAN
+	((uint16_t*)out)[i]=(((uint16_t)((uint8_t*)in)[3*i])<<8) |
+			    (((uint16_t)((uint8_t*)in)[3*i+1]));
+#else
+	((uint16_t*)out)[i]=(((uint16_t)((uint8_t*)in)[3*i+1])) |
+			    (((uint16_t)((uint8_t*)in)[3*i+2])<<8);
+#endif
+      }
+      break;
+    case(4):
+      for(i=0;i<len;i++) {
+#if WORDS_BIGENDIAN
+	((uint32_t*)out)[i]=(((uint32_t)((uint8_t*)in)[3*i])<<16) |
+			    (((uint32_t)((uint8_t*)in)[3*i+1])<<8) |
+			    (((uint32_t)((uint8_t*)in)[3*i+2]));
+#else
+	((uint32_t*)out)[i]=(((uint32_t)((uint8_t*)in)[3*i])) |
+			    (((uint32_t)((uint8_t*)in)[3*i+1])<<8) |
+			    (((uint32_t)((uint8_t*)in)[3*i+2])<<16);
+#endif
+      }
+      break;
+    }
+    break;      
   case(4):
     switch(outbps){
     case(1):
@@ -452,6 +574,19 @@
       for(i=0;i<len;i++)
 	((uint16_t*)out)[i]=(uint16_t)((((uint32_t*)in)[i])>>16);
       break;
+    case(3):
+      for(i=0;i<len;i++) {
+#if WORDS_BIGENDIAN
+	((uint8_t*)out)[3*i]=((uint8_t*)in)[4*i];
+	((uint8_t*)out)[3*i+1]=((uint8_t*)in)[4*i+1];
+	((uint8_t*)out)[3*i+2]=((uint8_t*)in)[4*i+2];
+#else
+	((uint8_t*)out)[3*i]=((uint8_t*)in)[4*i+1];
+	((uint8_t*)out)[3*i+1]=((uint8_t*)in)[4*i+2];
+	((uint8_t*)out)[3*i+2]=((uint8_t*)in)[4*i+3];
+#endif
+      }
+      break;
     }
     break;      
   }
@@ -469,6 +604,21 @@
     for(i=0;i<len;i++)
       ((int16_t*)out)[i]=(int16_t)lrintf(SHRT_MAX*((float*)in)[i]);
     break;
+  case(3):
+    for(i=0;i<len;i++) {
+      register int32_t r;
+      r=(int32_t)lrintf(INT_MAX*((float*)in)[i]);
+#if WORDS_BIGENDIAN
+      ((uint8_t*)out)[3*i]=(r&0x00FF0000)>>16;
+      ((uint8_t*)out)[3*i+1]=(r&0x0000FF00)>>8;
+      ((uint8_t*)out)[3*i+2]=r&0x000000FF;
+#else
+      ((uint8_t*)out)[3*i]=r&0x000000FF;
+      ((uint8_t*)out)[3*i+1]=(r&0x0000FF00)>>8;
+      ((uint8_t*)out)[3*i+2]=(r&0x00FF0000)>>16;
+#endif
+    }
+    break;
   case(4):
     for(i=0;i<len;i++)
       ((int32_t*)out)[i]=(int32_t)lrintf(INT_MAX*((float*)in)[i]);
@@ -488,6 +638,21 @@
     for(i=0;i<len;i++)
       ((float*)out)[i]=(1.0/SHRT_MAX)*((float)((int16_t*)in)[i]);
     break;
+  case(3):
+    for(i=0;i<len;i++) {
+      register int32_t s;
+#if WORDS_BIGENDIAN
+      s=(((int32_t)((uint8_t*)in)[3*i])<<16) |
+	(((int32_t)((uint8_t*)in)[3*i+1])<<8) |
+	(((int32_t)((uint8_t*)in)[3*i+2]));
+#else
+      s=(((int32_t)((uint8_t*)in)[3*i])) |
+	(((int32_t)((uint8_t*)in)[3*i+1])<<8) |
+	(((int32_t)((uint8_t*)in)[3*i+2])<<16);
+#endif
+      ((float*)out)[i]=(1.0/INT_MAX)*((float)s);
+    }
+    break;
   case(4):
     for(i=0;i<len;i++)
       ((float*)out)[i]=(1.0/INT_MAX)*((float)((int32_t*)in)[i]);