summaryrefslogtreecommitdiffstats
path: root/options
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-05-13 01:14:07 +0200
committerwm4 <wm4@nowhere>2014-05-13 02:39:37 +0200
commit2279f718de746d5fed3b64df74e9c47af98975b5 (patch)
tree57aa74740fcd067a5e87cb9810b2888b0548aeee /options
parent2a2dd8aac2d68db1471bbb4fd852f85f3fcf9c24 (diff)
downloadmpv-2279f718de746d5fed3b64df74e9c47af98975b5.tar.bz2
mpv-2279f718de746d5fed3b64df74e9c47af98975b5.tar.xz
player: reorganize how lua scripts are loaded
Make loading of scripts independent of Lua. Move some of the loading code from lua.c to scripting.c, and make it easier to add new scripting backends.
Diffstat (limited to 'options')
-rw-r--r--options/options.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/options/options.c b/options/options.c
index 5674c7dc0d..d3a10457a8 100644
--- a/options/options.c
+++ b/options/options.c
@@ -680,7 +680,9 @@ const struct MPOpts mp_default_opts = {
.osd_bar_h = 3.125,
.osd_scale = 1,
.osd_scale_by_window = 1,
+#if HAVE_LUA
.lua_load_osc = 1,
+#endif
.auto_load_scripts = 1,
.loop_times = -1,
.ordered_chapters = 1,