# HG changeset patch # User arpi # Date 1033946676 0 # Node ID 55f894f3e09db677456d5a2e604620352b6bf9b3 # Parent e1f1d5e1d789528d9aaf5a171781637ecbcaa439 reversed Anders' nonsense change diff -r e1f1d5e1d789 -r 55f894f3e09d mencoder.c --- 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;