summaryrefslogtreecommitdiffstats
path: root/mencoder.c
diff options
context:
space:
mode:
authorhenry <henry@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-03-29 16:47:20 +0000
committerhenry <henry@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-03-29 16:47:20 +0000
commit3bb75e793f1d8b19f555ca8570ac471f03f4ca07 (patch)
treef0b0e1f0aa50989e6b78f53a5ecb4dcd69e338eb /mencoder.c
parent6b66acc433092b6ea9259133223fcacac6e26365 (diff)
downloadmpv-3bb75e793f1d8b19f555ca8570ac471f03f4ca07.tar.bz2
mpv-3bb75e793f1d8b19f555ca8570ac471f03f4ca07.tar.xz
fix wrong channel count w/ pcm encoding
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9726 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
-rw-r--r--mencoder.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mencoder.c b/mencoder.c
index 5f685b565a..7a24fa0094 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -748,13 +748,13 @@ case ACODEC_COPY:
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;