# HG changeset patch
# User cladisch
# Date 1248431722 0
# Node ID 2de35e3585035c350229f0380c5c8ddf225aa698
# Parent  77080440d171f9525f78abb10bac101330bbba93
Use the correct OSS format, where possible, for mplayer's packed 24-bit
format (AFMT_x24_xE would be 32-bit aligned).

diff -r 77080440d171 -r 2de35e358503 libao2/ao_oss.c
--- a/libao2/ao_oss.c	Thu Jul 23 15:23:03 2009 +0000
+++ b/libao2/ao_oss.c	Fri Jul 24 10:35:22 2009 +0000
@@ -70,17 +70,8 @@
     case AF_FORMAT_U16_BE: return AFMT_U16_BE;
     case AF_FORMAT_S16_LE: return AFMT_S16_LE;
     case AF_FORMAT_S16_BE: return AFMT_S16_BE;
-#ifdef AFMT_U24_LE
-    case AF_FORMAT_U24_LE: return AFMT_U24_LE;
-#endif
-#ifdef AFMT_U24_BE
-    case AF_FORMAT_U24_BE: return AFMT_U24_BE;
-#endif
-#ifdef AFMT_S24_LE
-    case AF_FORMAT_S24_LE: return AFMT_S24_LE;
-#endif
-#ifdef AFMT_S24_BE
-    case AF_FORMAT_S24_BE: return AFMT_S24_BE;
+#ifdef AFMT_S24_PACKED
+    case AF_FORMAT_S24_LE: return AFMT_S24_PACKED;
 #endif
 #ifdef AFMT_U32_LE
     case AF_FORMAT_U32_LE: return AFMT_U32_LE;
@@ -122,17 +113,8 @@
     case AFMT_U16_BE: return AF_FORMAT_U16_BE;
     case AFMT_S16_LE: return AF_FORMAT_S16_LE;
     case AFMT_S16_BE: return AF_FORMAT_S16_BE;
-#ifdef AFMT_U24_LE
-    case AFMT_U24_LE: return AF_FORMAT_U24_LE;
-#endif
-#ifdef AFMT_U24_BE
-    case AFMT_U24_BE: return AF_FORMAT_U24_BE;
-#endif
-#ifdef AFMT_S24_LE
-    case AFMT_S24_LE: return AF_FORMAT_S24_LE;
-#endif
-#ifdef AFMT_S24_BE
-    case AFMT_S24_BE: return AF_FORMAT_S24_BE;
+#ifdef AFMT_S24_PACKED
+    case AFMT_S24_PACKED: return AF_FORMAT_S24_LE;
 #endif
 #ifdef AFMT_U32_LE
     case AFMT_U32_LE: return AF_FORMAT_U32_LE;