diff options
| author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-11-04 20:31:46 +0000 |
|---|---|---|
| committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-11-04 20:31:46 +0000 |
| commit | 4cd4fd0745dcd25a07686776133f02f10c7fa57f (patch) | |
| tree | dc3ab659daade32297a5078eae30976181ea4562 /libmpcodecs | |
| parent | 1c68e5af4b139e7c1bebdf0a6b94857c456376f0 (diff) | |
| download | mpv-4cd4fd0745dcd25a07686776133f02f10c7fa57f.tar.bz2 mpv-4cd4fd0745dcd25a07686776133f02f10c7fa57f.tar.xz | |
ms\0x00\x11 support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8104 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/ad_imaadpcm.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libmpcodecs/ad_imaadpcm.c b/libmpcodecs/ad_imaadpcm.c index d134ae63ef..c3a6339b49 100644 --- a/libmpcodecs/ad_imaadpcm.c +++ b/libmpcodecs/ad_imaadpcm.c @@ -13,6 +13,7 @@ 0x61: DK4 ADPCM found in certain AVI files on Sega Saturn CD-ROMs; note that this is a 'rogue' format number in that it was never officially registered with Microsoft + 0x1100736d: IMA ADPCM coded like in MS AVI/ASF/WAV found in QT files */ #include <stdio.h> @@ -86,7 +87,8 @@ static int preinit(sh_audio_t *sh_audio) // if format is "ima4", assume the audio is coming from a QT file which // indicates constant block size, whereas an AVI/ASF/WAV file will fill // in this field with 0x11 - if ((sh_audio->format == 0x11) || (sh_audio->format == 0x61)) + if ((sh_audio->format == 0x11) || (sh_audio->format == 0x61) || + (sh_audio->format == 0x1100736d)) { sh_audio->ds->ss_div = (sh_audio->wf->nBlockAlign - (MS_IMA_ADPCM_PREAMBLE_SIZE * sh_audio->wf->nChannels)) * 2; @@ -352,7 +354,7 @@ static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int m sh_audio->ds->ss_mul) return -1; - if (sh_audio->format == 0x11) + if ((sh_audio->format == 0x11) || (sh_audio->format == 0x1100736d)) { return 2 * ms_ima_adpcm_decode_block( (unsigned short*)buf, sh_audio->a_in_buffer, sh_audio->wf->nChannels, |