From 92f72678512ad904f3c5b347512cf1ae46949902 Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 6 Jan 2005 13:15:53 +0000
Subject: Check for every 24 and 32 bit AFMT_ separately if it is defined.
 Patch by Walter Haidinger walter dot haidinger at gmx dot at

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14398 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libao2/ao_oss.c | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

(limited to 'libao2')

diff --git a/libao2/ao_oss.c b/libao2/ao_oss.c
index e7016c513a..ebfad3874e 100644
--- a/libao2/ao_oss.c
+++ b/libao2/ao_oss.c
@@ -50,16 +50,28 @@ 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_S24_LE
+#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;
 #endif
-#ifdef AFMT_S32_LE
+#ifdef AFMT_U32_LE
     case AF_FORMAT_U32_LE: return AFMT_U32_LE;
+#endif
+#ifdef AFMT_U32_BE
     case AF_FORMAT_U32_BE: return AFMT_U32_BE;
+#endif
+#ifdef AFMT_S32_LE
     case AF_FORMAT_S32_LE: return AFMT_S32_LE;
+#endif
+#ifdef AFMT_S32_BE
     case AF_FORMAT_S32_BE: return AFMT_S32_BE;
 #endif
 #ifdef AFMT_FLOAT
@@ -90,16 +102,28 @@ 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_S24_LE
+#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;
 #endif
-#ifdef AFMT_S32_LE
+#ifdef AFMT_U32_LE
     case AFMT_U32_LE: return AF_FORMAT_U32_LE;
+#endif
+#ifdef AFMT_U32_BE
     case AFMT_U32_BE: return AF_FORMAT_U32_BE;
+#endif
+#ifdef AFMT_S32_LE
     case AFMT_S32_LE: return AF_FORMAT_S32_LE;
+#endif
+#ifdef AFMT_S32_BE
     case AFMT_S32_BE: return AF_FORMAT_S32_BE;
 #endif
 #ifdef AFMT_FLOAT
-- 
cgit v1.2.3