summaryrefslogtreecommitdiffstats
path: root/dec_audio.c
diff options
context:
space:
mode:
authorarpi_esp <arpi_esp@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-05-25 18:26:24 +0000
committerarpi_esp <arpi_esp@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-05-25 18:26:24 +0000
commit62d746269035bfcd7e241ef835302b80116ccd2f (patch)
treedaffeb0550f42c45086c4c611fc42a39a3de516d /dec_audio.c
parent7be13483763d5189a318b0928046faef9588ad9a (diff)
downloadmpv-62d746269035bfcd7e241ef835302b80116ccd2f.tar.bz2
mpv-62d746269035bfcd7e241ef835302b80116ccd2f.tar.xz
using alaw.h instead of alaw.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@884 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'dec_audio.c')
-rw-r--r--dec_audio.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/dec_audio.c b/dec_audio.c
index ad5457a85d..f4bd435ce1 100644
--- a/dec_audio.c
+++ b/dec_audio.c
@@ -25,7 +25,8 @@ int fakemono=0;
#include "mp3lib/mp3.h"
#include "libac3/ac3.h"
-#include "alaw.c"
+#include "alaw.h"
+
#include "xa/xa_gsm.h"
#include "loader/DirectShow/DS_AudioDec.h"
@@ -202,10 +203,6 @@ case 3: {
}
case 5: {
// aLaw audio codec:
- if(sh_audio->format==6)
- Gen_aLaw_2_Signed(); // init table
- else
- Gen_uLaw_2_Signed(); // init table
sh_audio->channels=sh_audio->wf->nChannels;
sh_audio->samplerate=sh_audio->wf->nSamplesPerSec;
sh_audio->i_bps=sh_audio->channels*sh_audio->samplerate;
@@ -290,10 +287,10 @@ int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen){
len=2*l;
if(sh_audio->format==6){
// aLaw
- while(l>0){ --l; d[l]=xa_alaw_2_sign[s[l]]; }
+ while(l>0){ --l; d[l]=alaw2short[s[l]]; }
} else {
// uLaw
- while(l>0){ --l; d[l]=xa_ulaw_2_sign[s[l]]; }
+ while(l>0){ --l; d[l]=ulaw2short[s[l]]; }
}
break;
}