diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-11-06 20:41:40 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-11-06 20:41:40 +0200 |
commit | e46ce9c0ac88cdc3b4604c249576cfde0c5c4946 (patch) | |
tree | 6553efdc461e8d81ae2c9a7508b2dec5f116905a /mplayer.c | |
parent | e51225dc3135e69d3f0fe6a5502c0c0e77952056 (diff) | |
parent | 14eb21fce00bfcab5145140f22bfd706d991c101 (diff) | |
download | mpv-e46ce9c0ac88cdc3b4604c249576cfde0c5c4946.tar.bz2 mpv-e46ce9c0ac88cdc3b4604c249576cfde0c5c4946.tar.xz |
Merge svn changes up to r27899
Diffstat (limited to 'mplayer.c')
-rw-r--r-- | mplayer.c | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -90,6 +90,7 @@ int slave_mode=0; int player_idle_mode=0; int quiet=0; int enable_mouse_movements=0; +float start_volume = -1; #if defined(__MINGW32__) || defined(__CYGWIN__) char * proc_priority=NULL; @@ -3602,6 +3603,8 @@ if(mpctx->sh_video){ audio_delay += mpctx->sh_video->stream_delay; } if(mpctx->sh_audio){ + if (start_volume >= 0) + mixer_setvolume(&mpctx->mixer, start_volume, start_volume); if (! ignore_start) audio_delay -= mpctx->sh_audio->stream_delay; mpctx->delay=-audio_delay; |