diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-10-16 16:49:58 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-10-16 16:49:58 +0000 |
| commit | 6d80c0060e6634af945f4550d9597e7960cdb022 (patch) | |
| tree | 3da8de310ca3c590e6017fc1c4bec8e33bc43a50 /libmpcodecs | |
| parent | 3cfed8bdb52d9932c767a28728746b7244c97a4b (diff) | |
| download | mpv-6d80c0060e6634af945f4550d9597e7960cdb022.tar.bz2 mpv-6d80c0060e6634af945f4550d9597e7960cdb022.tar.xz | |
set up ss_div/ss_mul properly, accept 'alaw' fourcc too
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7754 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/ad_alaw.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libmpcodecs/ad_alaw.c b/libmpcodecs/ad_alaw.c index ca8db2768a..5385d18e27 100644 --- a/libmpcodecs/ad_alaw.c +++ b/libmpcodecs/ad_alaw.c @@ -31,6 +31,8 @@ static int init(sh_audio_t *sh_audio) static int preinit(sh_audio_t *sh) { sh->audio_out_minsize=2048; + sh->ds->ss_div = 1; // 1 samples/packet + sh->ds->ss_mul = 1; // 1 bytes/packet return 1; } @@ -61,7 +63,7 @@ static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int m unsigned short *d=(unsigned short *) buf; unsigned char *s=buf; len=2*l; - if(sh_audio->format==6){ + if(sh_audio->format==6 || sh_audio->format==0x77616C61){ /* aLaw */ while(l>0){ --l; d[l]=alaw2short[s[l]]; } } else { |