Mercurial > mplayer.hg

comparison mplayer.c @ 7614:ce6a938aa6d3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Adding -format and -af switches
author anders
date Sun, 06 Oct 2002 11:23:02 +0000
parents c3bbe602aff3
children 7caeb275ad26
comparison
equal deleted inserted replaced
7613:ff6bcf692358 7614:ce6a938aa6d3
210 210
211 static int softsleep=0; 211 static int softsleep=0;
212 212
213 static float force_fps=0; 213 static float force_fps=0;
214 static int force_srate=0; 214 static int force_srate=0;
215 static int audio_output_format=0;
215 int frame_dropping=0; // option 0=no drop 1= drop vo 2= drop decode 216 int frame_dropping=0; // option 0=no drop 1= drop vo 2= drop decode
216 static int play_n_frames=-1; 217 static int play_n_frames=-1;
217 static int play_n_frames_mf=-1; 218 static int play_n_frames_mf=-1;
218 219
219 // screen info: 220 // screen info:
1238 current_module="ao2_init"; 1239 current_module="ao2_init";
1239 if(!(audio_out=init_best_audio_out(audio_driver_list, 1240 if(!(audio_out=init_best_audio_out(audio_driver_list,
1240 (ao_plugin_cfg.plugin_list), // plugin flag 1241 (ao_plugin_cfg.plugin_list), // plugin flag
1241 force_srate?force_srate:sh_audio->samplerate*playback_speed, 1242 force_srate?force_srate:sh_audio->samplerate*playback_speed,
1242 audio_output_channels?audio_output_channels: 1243 audio_output_channels?audio_output_channels:
1243 sh_audio->channels,sh_audio->sample_format,0))){ 1244 sh_audio->channels,audio_output_format?audio_output_format:
1245 sh_audio->sample_format,0))){
1244 // FAILED: 1246 // FAILED:
1245 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CannotInitAO); 1247 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CannotInitAO);
1246 sh_audio=d_audio->sh=NULL; // -> nosound 1248 sh_audio=d_audio->sh=NULL; // -> nosound
1247 } else { 1249 } else {
1248 // SUCCESS: 1250 // SUCCESS: