Mercurial > mplayer.hg
diff libao2/ao_nas.c @ 14245:815f03b7cee5
removing AFMT_ dependancy
author | alex |
---|---|
date | Mon, 27 Dec 2004 17:30:15 +0000 |
parents | a92101a7eb49 |
children | 1e16a8e3735b |
line wrap: on
line diff
--- a/libao2/ao_nas.c Mon Dec 27 11:09:49 2004 +0000 +++ b/libao2/ao_nas.c Mon Dec 27 17:30:15 2004 +0000 @@ -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 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); } }