summaryrefslogtreecommitdiffstats
path: root/cfg-mplayer.h
diff options
context:
space:
mode:
authorarpi_esp <arpi_esp@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-06-05 18:40:44 +0000
committerarpi_esp <arpi_esp@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-06-05 18:40:44 +0000
commit5c50d3e7dd839be03468e5058ce7d5eb60dfe1d8 (patch)
tree5c630dd1bec808dfe785e27b47615982d84040ad /cfg-mplayer.h
parent49ea21d07367275022349403cb4a60f8316e5634 (diff)
downloadmpv-5c50d3e7dd839be03468e5058ce7d5eb60dfe1d8.tar.bz2
mpv-5c50d3e7dd839be03468e5058ce7d5eb60dfe1d8.tar.xz
applied solaris8/netbsd/other fixes patch by Jürgen Keil <jk@tools.de>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1039 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'cfg-mplayer.h')
-rw-r--r--cfg-mplayer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h
index 8ca7978b1c..05c3a9f130 100644
--- a/cfg-mplayer.h
+++ b/cfg-mplayer.h
@@ -40,10 +40,10 @@ struct config conf[]={
{"ao", &audio_driver, CONF_TYPE_STRING, 0, 0, 0},
{"dsp", &dsp, CONF_TYPE_STRING, 0, 0, 0},
{"mixer", &mixer_device, CONF_TYPE_STRING, 0, 0, 0},
+ {"master", &mixer_usemaster, CONF_TYPE_FLAG, 0, 0, 1},
#ifdef HAVE_X11
{"display", &mDisplayName, CONF_TYPE_STRING, 0, 0, 0},
#endif
- {"master", &mixer_usemaster, CONF_TYPE_FLAG, 0, 0, 1},
{"osdlevel", &osd_level, CONF_TYPE_INT, CONF_RANGE, 0, 2 },
#ifdef HAVE_LIBCSS
{"dvdauth", &dvd_auth_device, CONF_TYPE_STRING, 0, 0, 0},