summaryrefslogtreecommitdiffstats
path: root/README.rst
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-04-18 14:41:01 +0200
committerwm4 <wm4@nowhere>2014-04-18 14:43:32 +0200
commita460a64c61eea321012638d06b9f27511984e296 (patch)
tree4376b70526eb7c71895003f58950185029720a63 /README.rst
parent7fd102ec319ca1372e2054cdac5548208af659ca (diff)
downloadmpv-build-a460a64c61eea321012638d06b9f27511984e296.tar.bz2
mpv-build-a460a64c61eea321012638d06b9f27511984e296.tar.xz
Remove customization note in ffmpeg-config
People edit this -> ./update stops working, unless the changes are committed, which is not very obvious. They should edit ffmpeg_options instead. There's a big section in the README about this. Also, make mpv-config read mpv_config.
Diffstat (limited to 'README.rst')
-rw-r--r--README.rst15
1 files changed, 14 insertions, 1 deletions
diff --git a/README.rst b/README.rst
index 9cc8f6c..d2a1b3f 100644
--- a/README.rst
+++ b/README.rst
@@ -163,7 +163,20 @@ because these are untested bleeding-edge development versions of the code.
Use on your own risk.
-(Note: in earlier mpv-build revisions, the script ``force-head`` did this.)
+Warning
+-------
+
+./rebuild will call ./update, but without this flag, and thus will
+checkout the release version again (i.e. it will not use master).
+
+mpv configure options
+=====================
+
+Just like ``ffmpeg_options``, the file ``mpv_options`` can be used
+to set custom mpv configure options. Like with ffmpeg_option, it
+expects one switch per line (e.g. ``--enable-something``).
+
+But normally, you shouldn't need this.
Contact
=======