[Mplayer-cvslog] CVS: main mencoder.c,1.239,1.240

[Alex Beregszaszi]

CVS change done by Alex Beregszaszi

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv13627

Modified Files:
	mencoder.c 
Log Message:
support for abitrary imaadpcm encoding, ported from ffmpeg

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -r1.239 -r1.240
--- mencoder.c	2 Apr 2004 03:44:30 -0000	1.239
+++ mencoder.c	7 Apr 2004 12:46:14 -0000	1.240
@@ -928,12 +928,8 @@
     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;