summaryrefslogtreecommitdiffstats
path: root/libao2/ao_oss.c
diff options
context:
space:
mode:
Diffstat (limited to 'libao2/ao_oss.c')
-rw-r--r--libao2/ao_oss.c28
1 files changed, 5 insertions, 23 deletions
diff --git a/libao2/ao_oss.c b/libao2/ao_oss.c
index c16d55c8df..0ff87efadd 100644
--- a/libao2/ao_oss.c
+++ b/libao2/ao_oss.c
@@ -70,17 +70,8 @@ static int format2oss(int format)
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 @@ static int oss2format(int format)
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;
@@ -353,7 +335,7 @@ ac3_retry:
ao_data.format=format;
oss_format=format2oss(format);
if (oss_format == -1) {
-#ifdef WORDS_BIGENDIAN
+#if HAVE_BIGENDIAN
oss_format=AFMT_S16_BE;
#else
oss_format=AFMT_S16_LE;