summaryrefslogtreecommitdiffstats
path: root/libao2/ao_nas.c
diff options
context:
space:
mode:
authoralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-12-27 17:30:15 +0000
committeralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-12-27 17:30:15 +0000
commit507121f7fe2d170dd8db99d3112602036ddef718 (patch)
tree38b26e115cfadde356b005496286f78307839440 /libao2/ao_nas.c
parent00f99a82a8f57573e3e6982cf9d014c9b9d8a68b (diff)
downloadmpv-507121f7fe2d170dd8db99d3112602036ddef718.tar.bz2
mpv-507121f7fe2d170dd8db99d3112602036ddef718.tar.xz
removing AFMT_ dependancy
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14246 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libao2/ao_nas.c')
-rw-r--r--libao2/ao_nas.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/libao2/ao_nas.c b/libao2/ao_nas.c
index 6f77bcbd9e..5955ac1b89 100644
--- a/libao2/ao_nas.c
+++ b/libao2/ao_nas.c
@@ -37,7 +37,7 @@
#include "audio_out.h"
#include "audio_out_internal.h"
-#include "afmt.h"
+#include "libaf/af_format.h"
#define NAS_FRAG_SIZE 4096
@@ -312,22 +312,22 @@ static AuDeviceID nas_find_device(AuServer *aud, int nch)
static unsigned int nas_aformat_to_auformat(unsigned int *format)
{
switch (*format) {
- case AFMT_U8:
+ case AF_FORMAT_U8:
return AuFormatLinearUnsigned8;
- case AFMT_S8:
+ case AF_FORMAT_S8:
return AuFormatLinearSigned8;
- case AFMT_U16_LE:
+ case AF_FORMAT_U16_LE:
return AuFormatLinearUnsigned16LSB;
- case AFMT_U16_BE:
+ case AF_FORMAT_U16_BE:
return AuFormatLinearUnsigned16MSB;
- case AFMT_S16_LE:
+ case AF_FORMAT_S16_LE:
return AuFormatLinearSigned16LSB;
- case AFMT_S16_BE:
+ case AF_FORMAT_S16_BE:
return AuFormatLinearSigned16MSB;
- case AFMT_MU_LAW:
+ case AF_FORMAT_MU_LAW:
return AuFormatULAW8;
default:
- *format=AFMT_S16_NE;
+ *format=AF_FORMAT_S16_NE;
return nas_aformat_to_auformat(format);
}
}