Default to git master branches for almost everything

2 files changed, 15 insertions, 8 deletions

diff --git a/README.rst b/README.rst
index a5b581e..8a70fc0 100644
--- a/README.rst
+++ b/README.rst
@@ -162,17 +162,24 @@ In general, changes to the mpv-build repository itself are relatively safe,
 keeping branches in sub-repositories might be ok, and making local, uncommitted
 changes in sub-repositories will break.
 
-Forcing master versions for some parts
-======================================
+Selecting release vs. master versions
+=====================================
+
+By default, mpv, ffmpeg and libass use the git master versions. These are
+bleeding edge, but should usually work fine. To get a stable (slightly stale)
+version, you can use release versions. Note that at least for mpv, releases
+are not actually maintained - releases are for Linux distributions, which are
+expected to maintain them and to backport bug fixes (which they usually fail
+to do).
 
 The following command can be used to delete all local changes, and to checkout
-the current master version for mpv:
+the latest release version of mpv:
 
-    ./use-mpv-master
+    ./use-mpv-release
 
-And run ``./rebuild`` or similar. Use this to switch back to the latest release:
+And run ``./rebuild`` or similar. Use this to switch back to git master:
 
-    ./use-mpv-release
+    ./use-mpv-master
 
 Likewise, you can use ``./use-ffmpeg-master`` and ``./use-ffmpeg-release`` to
 switch between git master and the latest FFmpeg release.
diff --git a/update b/update
index a7e34d5..3d4868f 100755
--- a/update
+++ b/update
@@ -59,10 +59,10 @@ do_fixedref()
     )
 }
 
-checkout_ffmpeg=do_releasetag
+checkout_ffmpeg=do_gitmaster
 checkout_fribidi=do_releasetag
 checkout_libass=do_gitmaster
-checkout_mpv=do_releasetag
+checkout_mpv=do_gitmaster
 
 checkout_all()
 {