diff options
author | wm4 <wm4@mplayer2.org> | 2012-04-01 22:52:33 +0200 |
---|---|---|
committer | wm4 <wm4@mplayer2.org> | 2012-04-01 22:52:33 +0200 |
commit | 1aa2e36122e6e664e42170f47d6db82873bef5aa (patch) | |
tree | 39e13f93bcb606da9e365c7cd379132bdf53c20b /options.h | |
parent | fea8c85c8595b797fc839b113c1db252fc55c798 (diff) | |
parent | 8cd71527ade21ea27ea24cdcc66dc71dca460f85 (diff) | |
download | mpv-1aa2e36122e6e664e42170f47d6db82873bef5aa.tar.bz2 mpv-1aa2e36122e6e664e42170f47d6db82873bef5aa.tar.xz |
Merge remote-tracking branch 'origin/master'
Conflicts:
bstr.c
bstr.h
etc/input.conf
input/input.c
input/input.h
libao2/ao_pulse.c
libmpcodecs/vf_ass.c
libmpcodecs/vf_vo.c
libvo/gl_common.c
libvo/x11_common.c
mixer.c
mixer.h
mplayer.c
Diffstat (limited to 'options.h')
-rw-r--r-- | options.h | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -6,6 +6,10 @@ typedef struct MPOpts { char **audio_driver_list; int fixed_vo; int vo_ontop; + char *mixer_device; + char *mixer_channel; + int softvol; + float softvol_max; int gapless_audio; int ao_buffersize; int screen_size_x; @@ -24,6 +28,7 @@ typedef struct MPOpts { int requested_colorspace; int requested_input_range; int requested_output_range; + int cursor_autohide_delay; // ranges -100 - 100, 1000 if the vo default should be used int vo_gamma_gamma; |