diff options
author | melanson <melanson@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-03-30 22:27:45 +0000 |
---|---|---|
committer | melanson <melanson@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-03-30 22:27:45 +0000 |
commit | a9803b9f75c07b97c597cca6223e29887a75b759 (patch) | |
tree | 2f0f9d2b085ce8402512fcf422d989715bcd8df8 /adpcm.h | |
parent | 73309be6c854414cecdcfbb8110926ed45b4af52 (diff) | |
download | mpv-a9803b9f75c07b97c597cca6223e29887a75b759.tar.bz2 mpv-a9803b9f75c07b97c597cca6223e29887a75b759.tar.xz |
reworked ADPCM decoders; changes include:
* fixed MS IMA ADPCM
* dissolved adpcm.c/.h into appropriate ad_* decoders
* DK4 audio is handled directly by IMA ADPCM decoder (this obsoletes
ad_dk4adpcm.c)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5409 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'adpcm.h')
-rw-r--r-- | adpcm.h | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -20,8 +20,10 @@ // this isn't exact #define DK3_ADPCM_SAMPLES_PER_BLOCK 6000 -int ima_adpcm_decode_block(unsigned short *output, unsigned char *input, +int qt_ima_adpcm_decode_block(unsigned short *output, unsigned char *input, int channels); +int ms_ima_adpcm_decode_block(unsigned short *output, unsigned char *input, + int channels, int block_size); int ms_adpcm_decode_block(unsigned short *output, unsigned char *input, int channels, int block_size); int dk4_adpcm_decode_block(unsigned short *output, unsigned char *input, |