Update mpv and ffmpeg

Major user-visible changes:
- OSD overhaul: remove some of the old OSD/sub options, which did not or
  barely worked, and add new options that work properly. The OSD font is
  now slightly more configureable as well. Look for options starting
  with --osd-... on the manpage.
- Image subtitles (like DVD/vobsubs) are rendered in color (disable with
  --sub-gray), and image subtitle placement is a bit more correct.
- The 's' key now takes screenshots with subtitles by default, and
  'shift+s' takes screenshots without subtitles. (Assumes you don't have
  a custom input.conf, or that your input.conf doesn't overrides these
  keys.)
- vo_xv can now take screenshots without OSD or subtitles natively. It
  doesn't framestep anymore in certain situations (e.g. playing with OSD
  on screen -> pausing -> toggling fullscreen -> vo_xv used to play one
  video frame and some audio to redraw the OSD).
  (Subtitle colors should be more correct as well and behave the same
  as with vo_opengl and vo_vdpau.)
- Show video title in window title instead on the console when
  streaming with libquvi.
- Encoding audio breakage with newer ffmpeg versions has been fixed.

5 files changed, 26 insertions, 10 deletions

diff --git a/.gitmodules b/.gitmodules
index 5b3679a..135380b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,7 +3,7 @@
 	url = https://github.com/mpv-player/mpv.git
 [submodule "ffmpeg"]
 	path = ffmpeg
-	url = git://git.videolan.org/ffmpeg.git
+	url = git://source.ffmpeg.org/ffmpeg.git
 [submodule "libass"]
 	path = libass
 	url = git://repo.or.cz/libass.git
diff --git a/README b/README
index f2b497c..2b8c492 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 This is a collection of scripts to make downloading and building mpv, ffmpeg
 and libass easier. ffmpeg and libass get special treatment, because they are
-essential, and distribution packages are often too old.
+essential, and distribution packages are often too old or too broken.
 
 Update the ffmpeg, libass and mpv sources with the following command:
 
@@ -10,16 +10,32 @@ This is also needed before doing the first build after the initial checkout.
 
 Build mpv and ffmpeg/libass with:
 
-    make mpv
+    make clean                        # sometimes needed to build successfully
+    make
 
 Install mpv with:
 
-    make install
+    sudo make install
 
-mpv doesn't need to be installed. The binary in ./mpv/ can be used as-is. Note
-that libass and ffmpeg will be statically linked with mpv when using the
-provided scripts.
+Or if you don't want debugging symbols (smaller binaries):
+
+    sudo make install-strip
 
+mpv doesn't need to be installed. The binary ./mpv/mpv can be used as-is. Note
+that libass and ffmpeg will be statically linked with mpv when using the
+provided scripts, and no ffmpeg or libass libraries are/need to be installed.
+
+Essential dependencies (incomplete list):
+- gcc, yasm
+- X development headers (xlib, X extensions, vdpau, GL, Xv, ...)
+- Audio output development headers (libasound, pulseaudio)
+- fribidi, freetype, fontconfig development headers (for libass)
+- libjpeg
+- libquvi if you want to play Youtube videos directly
+- libx264 if you want to use encoding (you have to add --enable-libx264 to
+  scripts/ffmpeg-config, because ffmpeg doesn't autodetect this library)
+
+Note: most dependencies are optional and autodetected. If they're missing,
+these features will be disabled silently. This includes some dependencies
+which could be considered essential.
 
-TODO:
-- List dependencies.
diff --git a/ffmpeg b/ffmpeg
-Subproject bc077ca6b5f8bb3afdc557f29468aed956012d3
+Subproject b5ffbcd0cd2391f22f9ef3a1398d8fc60cbcce0
diff --git a/mpv b/mpv
-Subproject de3f6718124372f64443a0b86527c1abf86d6f8
+Subproject 6c1c04ba2160e1716a5c860104ea1ea6156e7cf
diff --git a/scripts/ffmpeg-config b/scripts/ffmpeg-config
index 38fc1e9..ca1bf92 100755
--- a/scripts/ffmpeg-config
+++ b/scripts/ffmpeg-config
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-OPTIONS="--enable-gpl --enable-nonfree"
+OPTIONS="--enable-gpl --enable-nonfree --disable-debug"
 
 BUILD="$(pwd)"
 mkdir -p "$BUILD"/ffmpeg_build