Mercurial > mplayer.hg
changeset 14822:b1ee78ccf111
compile fix
| author | henry |
|---|---|
| date | Fri, 25 Feb 2005 12:59:59 +0000 |
| parents | 141cd95300dc |
| children | db2e558ab516 |
| files | mencoder.c |
| diffstat | 1 files changed, 7 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/mencoder.c Fri Feb 25 11:47:46 2005 +0000 +++ b/mencoder.c Fri Feb 25 12:59:59 2005 +0000 @@ -853,10 +853,9 @@ // setup filter: if(!init_audio_filters(sh_audio, sh_audio->samplerate, - sh_audio->channels, sh_audio->sample_format, sh_audio->samplesize, + sh_audio->channels, sh_audio->sample_format, mux_a->wf->nSamplesPerSec, mux_a->wf->nChannels, (mux_a->wf->wBitsPerSample==8)? AF_FORMAT_U8:AF_FORMAT_S16_LE, - mux_a->wf->wBitsPerSample/8, 16384, mux_a->wf->nAvgBytesPerSec)){ mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_NoMatchingFilter); } @@ -886,9 +885,9 @@ // setup filter: if(!init_audio_filters(sh_audio, sh_audio->samplerate, - sh_audio->channels, sh_audio->sample_format, sh_audio->samplesize, + sh_audio->channels, sh_audio->sample_format, mux_a->wf->nSamplesPerSec, mux_a->wf->nChannels, - AF_FORMAT_S16_NE, 2, + AF_FORMAT_S16_NE, 4608, mux_a->h.dwRate*mux_a->wf->nChannels*2)){ mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_NoMatchingFilter); } @@ -1023,9 +1022,9 @@ if (!init_audio_filters( sh_audio, sh_audio->samplerate, sh_audio->channels, - sh_audio->sample_format, sh_audio->samplesize, + sh_audio->sample_format, mux_a->wf->nSamplesPerSec, mux_a->wf->nChannels, - AF_FORMAT_S16_NE, 2, + AF_FORMAT_S16_NE, mux_a->h.dwSuggestedBufferSize, mux_a->h.dwSuggestedBufferSize*2)) { mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_NoMatchingFilter); @@ -1088,9 +1087,9 @@ if (!init_audio_filters( sh_audio, sh_audio->samplerate, sh_audio->channels, - sh_audio->sample_format, sh_audio->samplesize, + sh_audio->sample_format, mux_a->wf->nSamplesPerSec, mux_a->wf->nChannels, - AF_FORMAT_S16_NE, 2, + AF_FORMAT_S16_NE, mux_a->h.dwSuggestedBufferSize, mux_a->h.dwSuggestedBufferSize*2)) { mp_msg(MSGT_CPLAYER, MSGL_ERR, "Couldn't find matching filter / ao format!\n"); @@ -1246,11 +1245,9 @@ sh_audio->samplerate, sh_audio->channels, sh_audio->sample_format, - sh_audio->samplesize, mux_a->wf->nSamplesPerSec, mux_a->wf->nChannels, AF_FORMAT_S16_NE, - 2, 4608, mux_a->h.dwRate*mux_a->wf->nChannels*2)) {