summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-12-23 11:35:37 +0100
committerwm4 <wm4@nowhere>2013-12-23 11:35:37 +0100
commit9fb0441b163eb073f882ab031e0749f838f3b851 (patch)
treee0ec686653c1792b79539fe56555c1bd41813a8b
parent6565ec8b41df839dfb5b6c5ff724e0626cf484d0 (diff)
downloadmpv-9fb0441b163eb073f882ab031e0749f838f3b851.tar.bz2
mpv-9fb0441b163eb073f882ab031e0749f838f3b851.tar.xz
options: disable joystick by default
-rw-r--r--DOCS/man/en/options.rst2
-rw-r--r--options/options.c1
2 files changed, 1 insertions, 2 deletions
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst
index 8c3e87abc7..a1f48d32a1 100644
--- a/DOCS/man/en/options.rst
+++ b/DOCS/man/en/options.rst
@@ -1222,7 +1222,7 @@ OPTIONS
like any other binding). See `INPUT.CONF`_.
``--joystick``, ``--no-joystick``
- Enable/disable joystick support. Enabled by default.
+ Enable/disable joystick support. Disabled by default.
``--no-keepaspect``, ``--keepaspect``
``--no-keepaspect`` will always stretch the video to window size, and will
diff --git a/options/options.c b/options/options.c
index 84005536b2..ea1de3e3f6 100644
--- a/options/options.c
+++ b/options/options.c
@@ -756,7 +756,6 @@ const struct MPOpts mp_default_opts = {
.doubleclick_time = 300,
.ar_delay = 200,
.ar_rate = 40,
- .use_joystick = 1,
.use_lirc = 1,
.use_alt_gr = 1,
#if HAVE_COCOA