From 9fb0441b163eb073f882ab031e0749f838f3b851 Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 23 Dec 2013 11:35:37 +0100 Subject: options: disable joystick by default --- DOCS/man/en/options.rst | 2 +- options/options.c | 1 - 2 files changed, 1 insertion(+), 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 -- cgit v1.2.3