Mercurial > mplayer.hg

comparison mencoder.c @ 14822:b1ee78ccf111

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
compile fix
author henry
date Fri, 25 Feb 2005 12:59:59 +0000
parents 39f93fbc52dc
children 1c9d87e6607f
comparison
equal deleted inserted replaced
14821:141cd95300dc 14822:b1ee78ccf111
851 mux_a->wf->wBitsPerSample=16; 851 mux_a->wf->wBitsPerSample=16;
852 mux_a->wf->cbSize=0; // FIXME for l3codeca.acm 852 mux_a->wf->cbSize=0; // FIXME for l3codeca.acm
853 // setup filter: 853 // setup filter:
854 if(!init_audio_filters(sh_audio, 854 if(!init_audio_filters(sh_audio,
855 sh_audio->samplerate, 855 sh_audio->samplerate,
856 sh_audio->channels, sh_audio->sample_format, sh_audio->samplesize, 856 sh_audio->channels, sh_audio->sample_format,
857 mux_a->wf->nSamplesPerSec, mux_a->wf->nChannels, 857 mux_a->wf->nSamplesPerSec, mux_a->wf->nChannels,
858 (mux_a->wf->wBitsPerSample==8)? AF_FORMAT_U8:AF_FORMAT_S16_LE, 858 (mux_a->wf->wBitsPerSample==8)? AF_FORMAT_U8:AF_FORMAT_S16_LE,
859 mux_a->wf->wBitsPerSample/8,
860 16384, mux_a->wf->nAvgBytesPerSec)){ 859 16384, mux_a->wf->nAvgBytesPerSec)){
861 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_NoMatchingFilter); 860 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_NoMatchingFilter);
862 } 861 }
863 break; 862 break;
864 #ifdef HAVE_MP3LAME 863 #ifdef HAVE_MP3LAME
884 ((MPEGLAYER3WAVEFORMAT*)(mux_a->wf))->nFramesPerBlock=1; 883 ((MPEGLAYER3WAVEFORMAT*)(mux_a->wf))->nFramesPerBlock=1;
885 ((MPEGLAYER3WAVEFORMAT*)(mux_a->wf))->nCodecDelay=0; 884 ((MPEGLAYER3WAVEFORMAT*)(mux_a->wf))->nCodecDelay=0;
886 // setup filter: 885 // setup filter:
887 if(!init_audio_filters(sh_audio, 886 if(!init_audio_filters(sh_audio,
888 sh_audio->samplerate, 887 sh_audio->samplerate,
889 sh_audio->channels, sh_audio->sample_format, sh_audio->samplesize, 888 sh_audio->channels, sh_audio->sample_format,
890 mux_a->wf->nSamplesPerSec, mux_a->wf->nChannels, 889 mux_a->wf->nSamplesPerSec, mux_a->wf->nChannels,
891 AF_FORMAT_S16_NE, 2, 890 AF_FORMAT_S16_NE,
892 4608, mux_a->h.dwRate*mux_a->wf->nChannels*2)){ 891 4608, mux_a->h.dwRate*mux_a->wf->nChannels*2)){
893 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_NoMatchingFilter); 892 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_NoMatchingFilter);
894 } 893 }
895 break; 894 break;
896 #endif 895 #endif
1021 1020
1022 // setup filter: 1021 // setup filter:
1023 if (!init_audio_filters( 1022 if (!init_audio_filters(
1024 sh_audio, 1023 sh_audio,
1025 sh_audio->samplerate, sh_audio->channels, 1024 sh_audio->samplerate, sh_audio->channels,
1026 sh_audio->sample_format, sh_audio->samplesize, 1025 sh_audio->sample_format,
1027 mux_a->wf->nSamplesPerSec, mux_a->wf->nChannels, 1026 mux_a->wf->nSamplesPerSec, mux_a->wf->nChannels,
1028 AF_FORMAT_S16_NE, 2, 1027 AF_FORMAT_S16_NE,
1029 mux_a->h.dwSuggestedBufferSize, 1028 mux_a->h.dwSuggestedBufferSize,
1030 mux_a->h.dwSuggestedBufferSize*2)) { 1029 mux_a->h.dwSuggestedBufferSize*2)) {
1031 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_NoMatchingFilter); 1030 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_NoMatchingFilter);
1032 exit(1); 1031 exit(1);
1033 } 1032 }
1086 1085
1087 // setup filter: 1086 // setup filter:
1088 if (!init_audio_filters( 1087 if (!init_audio_filters(
1089 sh_audio, 1088 sh_audio,
1090 sh_audio->samplerate, sh_audio->channels, 1089 sh_audio->samplerate, sh_audio->channels,
1091 sh_audio->sample_format, sh_audio->samplesize, 1090 sh_audio->sample_format,
1092 mux_a->wf->nSamplesPerSec, mux_a->wf->nChannels, 1091 mux_a->wf->nSamplesPerSec, mux_a->wf->nChannels,
1093 AF_FORMAT_S16_NE, 2, 1092 AF_FORMAT_S16_NE,
1094 mux_a->h.dwSuggestedBufferSize, 1093 mux_a->h.dwSuggestedBufferSize,
1095 mux_a->h.dwSuggestedBufferSize*2)) { 1094 mux_a->h.dwSuggestedBufferSize*2)) {
1096 mp_msg(MSGT_CPLAYER, MSGL_ERR, "Couldn't find matching filter / ao format!\n"); 1095 mp_msg(MSGT_CPLAYER, MSGL_ERR, "Couldn't find matching filter / ao format!\n");
1097 exit(1); 1096 exit(1);
1098 } 1097 }
1244 } 1243 }
1245 if (do_init_filters) if(!init_audio_filters(sh_audio, 1244 if (do_init_filters) if(!init_audio_filters(sh_audio,
1246 sh_audio->samplerate, 1245 sh_audio->samplerate,
1247 sh_audio->channels, 1246 sh_audio->channels,
1248 sh_audio->sample_format, 1247 sh_audio->sample_format,
1249 sh_audio->samplesize,
1250 mux_a->wf->nSamplesPerSec, 1248 mux_a->wf->nSamplesPerSec,
1251 mux_a->wf->nChannels, 1249 mux_a->wf->nChannels,
1252 AF_FORMAT_S16_NE, 1250 AF_FORMAT_S16_NE,
1253 2,
1254 4608, 1251 4608,
1255 mux_a->h.dwRate*mux_a->wf->nChannels*2)) 1252 mux_a->h.dwRate*mux_a->wf->nChannels*2))
1256 { 1253 {
1257 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_NoMatchingFilter); 1254 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_NoMatchingFilter);
1258 exit(1); 1255 exit(1);