Mercurial > mplayer.hg

comparison mencoder.c @ 9725:b9f43efd98e7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix wrong channel count w/ pcm encoding
author henry
date Sat, 29 Mar 2003 16:47:20 +0000
parents 76c6d8f1ebf5
children 27fff718ede6
comparison
equal deleted inserted replaced
9724:77a31536f1e2 9725:b9f43efd98e7
746 mux_a->wf->wFormatTag, mux_a->wf->nChannels, mux_a->wf->nSamplesPerSec, 746 mux_a->wf->wFormatTag, mux_a->wf->nChannels, mux_a->wf->nSamplesPerSec,
747 mux_a->wf->wBitsPerSample, mux_a->wf->nAvgBytesPerSec, mux_a->h.dwSampleSize); 747 mux_a->wf->wBitsPerSample, mux_a->wf->nAvgBytesPerSec, mux_a->h.dwSampleSize);
748 break; 748 break;
749 case ACODEC_PCM: 749 case ACODEC_PCM:
750 printf("CBR PCM audio selected\n"); 750 printf("CBR PCM audio selected\n");
751 mux_a->h.dwSampleSize=2*sh_audio->channels;
752 mux_a->h.dwScale=1; 751 mux_a->h.dwScale=1;
753 mux_a->h.dwRate=force_srate?force_srate:sh_audio->samplerate; 752 mux_a->h.dwRate=force_srate?force_srate:sh_audio->samplerate;
754 mux_a->wf=malloc(sizeof(WAVEFORMATEX)); 753 mux_a->wf=malloc(sizeof(WAVEFORMATEX));
755 mux_a->wf->nBlockAlign=mux_a->h.dwSampleSize;
756 mux_a->wf->wFormatTag=0x1; // PCM 754 mux_a->wf->wFormatTag=0x1; // PCM
757 mux_a->wf->nChannels=audio_output_channels?audio_output_channels:sh_audio->channels; 755 mux_a->wf->nChannels=audio_output_channels?audio_output_channels:sh_audio->channels;
756 mux_a->h.dwSampleSize=2*mux_a->wf->nChannels;
757 mux_a->wf->nBlockAlign=mux_a->h.dwSampleSize;
758 mux_a->wf->nSamplesPerSec=mux_a->h.dwRate; 758 mux_a->wf->nSamplesPerSec=mux_a->h.dwRate;
759 mux_a->wf->nAvgBytesPerSec=mux_a->h.dwSampleSize*mux_a->wf->nSamplesPerSec; 759 mux_a->wf->nAvgBytesPerSec=mux_a->h.dwSampleSize*mux_a->wf->nSamplesPerSec;
760 mux_a->wf->wBitsPerSample=16; 760 mux_a->wf->wBitsPerSample=16;
761 mux_a->wf->cbSize=0; // FIXME for l3codeca.acm 761 mux_a->wf->cbSize=0; // FIXME for l3codeca.acm
762 // setup filter: 762 // setup filter: