Mercurial > mplayer.hg

diff mencoder.c @ 7643:55f894f3e09d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
reversed Anders' nonsense change
author arpi
date Sun, 06 Oct 2002 23:24:36 +0000
parents ce6a938aa6d3
children a164381ae537
line wrap: on
line diff
--- a/mencoder.c	Sun Oct 06 20:59:46 2002 +0000
+++ b/mencoder.c	Sun Oct 06 23:24:36 2002 +0000
@@ -672,7 +672,7 @@
     } else {
 	mux_a->wf = malloc(sizeof(WAVEFORMATEX));
 	mux_a->wf->nBlockAlign = 1; //mux_a->h.dwSampleSize;
-	mux_a->wf->wFormatTag = audio_output_format?audio_output_format:sh_audio->format;
+	mux_a->wf->wFormatTag = sh_audio->format;
 	mux_a->wf->nChannels = sh_audio->channels;
 	mux_a->wf->nSamplesPerSec = sh_audio->samplerate;
 	mux_a->wf->nAvgBytesPerSec=sh_audio->i_bps; //mux_a->h.dwSampleSize*mux_a->wf->nSamplesPerSec;