[Mplayer-cvslog] CVS: 0_90 mencoder.c,1.205,1.206

[Arpi of Ize]

Update of /cvsroot/mplayer/0_90
In directory mail:/var/tmp.root/cvs-serv25733

Modified Files:
	mencoder.c 
Log Message:
backport: -oac pcm mono fix


Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/0_90/mencoder.c,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- mencoder.c	10 Mar 2003 16:12:11 -0000	1.205
+++ mencoder.c	20 May 2003 17:40:36 -0000	1.206
@@ -745,13 +745,13 @@
     break;
 case ACODEC_PCM:
     printf("CBR PCM audio selected\n");
-    mux_a->h.dwSampleSize=2*sh_audio->channels;
     mux_a->h.dwScale=1;
     mux_a->h.dwRate=force_srate?force_srate:sh_audio->samplerate;
     mux_a->wf=malloc(sizeof(WAVEFORMATEX));
-    mux_a->wf->nBlockAlign=mux_a->h.dwSampleSize;
     mux_a->wf->wFormatTag=0x1; // PCM
     mux_a->wf->nChannels=audio_output_channels?audio_output_channels:sh_audio->channels;
+    mux_a->h.dwSampleSize=2*mux_a->wf->nChannels;
+    mux_a->wf->nBlockAlign=mux_a->h.dwSampleSize;
     mux_a->wf->nSamplesPerSec=mux_a->h.dwRate;
     mux_a->wf->nAvgBytesPerSec=mux_a->h.dwSampleSize*mux_a->wf->nSamplesPerSec;
     mux_a->wf->wBitsPerSample=16;