Mercurial > mplayer.hg

comparison 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
comparison
equal deleted inserted replaced
7642:e1f1d5e1d789 7643:55f894f3e09d
670 mux_a->wf=sh_audio->wf; 670 mux_a->wf=sh_audio->wf;
671 if(!sh_audio->i_bps) sh_audio->i_bps=mux_a->wf->nAvgBytesPerSec; 671 if(!sh_audio->i_bps) sh_audio->i_bps=mux_a->wf->nAvgBytesPerSec;
672 } else { 672 } else {
673 mux_a->wf = malloc(sizeof(WAVEFORMATEX)); 673 mux_a->wf = malloc(sizeof(WAVEFORMATEX));
674 mux_a->wf->nBlockAlign = 1; //mux_a->h.dwSampleSize; 674 mux_a->wf->nBlockAlign = 1; //mux_a->h.dwSampleSize;
675 mux_a->wf->wFormatTag = audio_output_format?audio_output_format:sh_audio->format; 675 mux_a->wf->wFormatTag = sh_audio->format;
676 mux_a->wf->nChannels = sh_audio->channels; 676 mux_a->wf->nChannels = sh_audio->channels;
677 mux_a->wf->nSamplesPerSec = sh_audio->samplerate; 677 mux_a->wf->nSamplesPerSec = sh_audio->samplerate;
678 mux_a->wf->nAvgBytesPerSec=sh_audio->i_bps; //mux_a->h.dwSampleSize*mux_a->wf->nSamplesPerSec; 678 mux_a->wf->nAvgBytesPerSec=sh_audio->i_bps; //mux_a->h.dwSampleSize*mux_a->wf->nSamplesPerSec;
679 mux_a->wf->wBitsPerSample = 16; // FIXME 679 mux_a->wf->wBitsPerSample = 16; // FIXME
680 mux_a->wf->cbSize=0; // FIXME for l3codeca.acm 680 mux_a->wf->cbSize=0; // FIXME for l3codeca.acm