Merge branch 'master' into release/0.9

* master: (87 commits)
  manpage: move --autosync description
  player: add --window-scale option
  player: flush decoder even if cover art is decoded
  player: don't show A/V desync message in non-sense situations
  w32_common: add more rounded-down frame rates
  w32_common: use the current monitor's refresh rate
  dxva2: fix broken build with gcc 5.1
  terminal: printf() is not signal-safe
  man: fix PDF build
  DOCS/mplayer-changes: Eleborate on joystick input
  osc: add nil check for element.eventresponder
  mp_image: remove some unused interlacing flags
  vf_vapoursynth: update _FieldBased semantics
  options: remove unneeded hack from command line parser
  manpage: document ff-index sub-property
  demux_mkv: limit timestamp fixing to 1ms max
  demux_mkv: attempt to fix rounded timestamps
  demux_mkv: move global options to the demuxer
  demux_mkv: better seeking after video end
  lua: add utils.format_json() function
  ...

1 files changed, 4 insertions, 1 deletions

diff --git a/options/parse_configfile.c b/options/parse_configfile.c
index 2b2e8a864f..8ccf6579ba 100644
--- a/options/parse_configfile.c
+++ b/options/parse_configfile.c
@@ -106,7 +106,10 @@ int m_config_parse(m_config_t *config, const char *location, bstr data,
                 if (rest.len == line.len || !bstr_eatstart0(&rest, "%") ||
                     len > rest.len)
                 {
-                    MP_ERR(config, "%s broken escaping with '%%'\n", loc);
+                    MP_ERR(config, "%s fixed-length quoting expected - put "
+                           "\"quotes\" around the option value if you did not "
+                           "intend to use this, but your option value starts "
+                           "with '%%'\n", loc);
                     goto error;
                 }
                 value = bstr_splice(rest, 0, len);