diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-10-06 23:24:36 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-10-06 23:24:36 +0000 |
| commit | 58bf423ca94e9886b62e259f75a82d8b806ed7b9 (patch) | |
| tree | 8fe4b7b19a81c9ebd39c2f0fdb5b337eb55bb067 /mencoder.c | |
| parent | a5a049336c62c6f5d21dd073737a4b51288ebbe5 (diff) | |
| download | mpv-58bf423ca94e9886b62e259f75a82d8b806ed7b9.tar.bz2 mpv-58bf423ca94e9886b62e259f75a82d8b806ed7b9.tar.xz | |
reversed Anders' nonsense change
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7644 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
| -rw-r--r-- | mencoder.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mencoder.c b/mencoder.c index 3f37e5a100..fb09ec500b 100644 --- a/mencoder.c +++ b/mencoder.c @@ -672,7 +672,7 @@ case ACODEC_COPY: } 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; |