summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authoranders <anders@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-10-06 11:23:02 +0000
committeranders <anders@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-10-06 11:23:02 +0000
commit735de602321d160b12ea2edd70a89cc105f33017 (patch)
tree862d68c69b45b7123979ed2bb5038391a537655c /mplayer.c
parent3605b121ab30aeffd320c09b15d9b37573debffb (diff)
downloadmpv-735de602321d160b12ea2edd70a89cc105f33017.tar.bz2
mpv-735de602321d160b12ea2edd70a89cc105f33017.tar.xz
Adding -format and -af switches
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7615 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/mplayer.c b/mplayer.c
index 88ebd1ea6d..c0bfa83d7c 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -212,6 +212,7 @@ static int softsleep=0;
static float force_fps=0;
static int force_srate=0;
+static int audio_output_format=0;
int frame_dropping=0; // option 0=no drop 1= drop vo 2= drop decode
static int play_n_frames=-1;
static int play_n_frames_mf=-1;
@@ -1240,7 +1241,8 @@ if(sh_audio){
(ao_plugin_cfg.plugin_list), // plugin flag
force_srate?force_srate:sh_audio->samplerate*playback_speed,
audio_output_channels?audio_output_channels:
- sh_audio->channels,sh_audio->sample_format,0))){
+ sh_audio->channels,audio_output_format?audio_output_format:
+ sh_audio->sample_format,0))){
// FAILED:
mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CannotInitAO);
sh_audio=d_audio->sh=NULL; // -> nosound