diff options
| author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-04-07 12:46:14 +0000 |
|---|---|---|
| committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-04-07 12:46:14 +0000 |
| commit | 11c255bf20a0441c0490818168649554120ba75e (patch) | |
| tree | 89f2961a6af57c41ebba0c3003ad7414c98ce7b6 /mencoder.c | |
| parent | 6835ae93456f24ad85c88aa39dbe0a6c953b57cd (diff) | |
| download | mpv-11c255bf20a0441c0490818168649554120ba75e.tar.bz2 mpv-11c255bf20a0441c0490818168649554120ba75e.tar.xz | |
support for abitrary imaadpcm encoding, ported from ffmpeg
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12150 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
| -rw-r--r-- | mencoder.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/mencoder.c b/mencoder.c index e1ac019cdb..31ca7ace60 100644 --- a/mencoder.c +++ b/mencoder.c @@ -928,12 +928,8 @@ case ACODEC_LAVC: case 0x11: /* imaadpcm */ mux_a->wf->wBitsPerSample = 4; mux_a->wf->cbSize = 2; - /* - * Magic imaadpcm values, currently probably only valid - * for 48KHz Stereo - */ - ((unsigned char*)mux_a->wf)[sizeof(WAVEFORMATEX)] = 0xf9; - ((unsigned char*)mux_a->wf)[sizeof(WAVEFORMATEX)+1] = 0x07; + ((uint16_t*)mux_a->wf)[sizeof(WAVEFORMATEX)] = + ((lavc_actx->block_align - 4 * lavc_actx->channels) / (4 * lavc_actx->channels)) * 8 + 1; break; case 0x55: /* mp3 */ mux_a->wf->cbSize = 12; |