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

1 files changed, 5 insertions, 0 deletions

diff --git a/options.h b/options.h
index f667031595..e77384b7f4 100644
--- a/options.h
+++ b/options.h
@@ -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;