Merge branch 'multimedia' again

Forgot a few commits in the original merge.

diff --combined multimedia/mpv/mpv.conf
index 19eeaa3203f9fc522ae2995bc624ceea2a79bb6a,eb4ff5ca9f8123f56cf0349a54043037080c9562..eb4ff5ca9f8123f56cf0349a54043037080c9562
--- 1/multimedia/mpv/mpv.conf
--- 2/mpv/mpv.conf
+++ b/multimedia/mpv/mpv.conf
@@@ -1,6 -1,6 +1,6 @@@
  # Mpv (mplayer2 fork) configuration file.
  
- # Copyright (C) 2011-2015  Simon Ruderich
+ # Copyright (C) 2011-2016  Simon Ruderich
  #
  # This file is free software: you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
@@@ -16,10 -16,11 +16,11 @@@
  # along with this file.  If not, see <http://www.gnu.org/licenses/>.
  
  
- # Use ALSA as audio driver, use PCM for volume control.
- ao=alsa:mixer-name=PCM
- # Use the audio driver volume control if possible.
- softvol=no
+ # Use ALSA as audio driver.
+ ao=alsa
+ # Set default value of internal mixer (0-100). Since 0.18.1 mpv has no access
+ # to hardware mixer.
+ volume=50
  
  # Fullscreen playback.
  fs=yes
@@@ -39,24 -40,26 +40,26 @@@ demuxer-mkv-subtitle-preroll=ye
  sub-visibility=no
  
  # Reduce subtitle size (default is 45).
- sub-text-font-size=33
+ sub-font-size=33
  # Increase bottom margin for subtitles (default is 10). Makes them more
  # pleasant to read for me.
- sub-text-margin-y=30
+ sub-margin-y=30
+ 
+ # Try to find subtitles in similar-looking file names.
+ sub-auto=fuzzy
  
  # Disable the mouse as I don't use it.
  input-cursor=no
  
- # Always hide the cursor when playing a movie in fullscreen movie.
+ # Always hide the cursor.
  cursor-autohide=always
- cursor-autohide-fs-only
  
  # Disable "on screen controller". I use the keyboard only.
  osc=no
  
  # Display position/length and cache in the progress overlay ("P" binding).
  # Thanks to wm4 in $mpv-player on Freenode (2014-08-18 01:24 CEST).
- osd-status-msg="${time-pos} / ${length} (${percent-pos}%)${?cache: Cache: ${cache}%}"
+ osd-status-msg="${time-pos} / ${duration} (${percent-pos}%)${?cache-percent: Cache: ${cache-percent}%}"
  
  # Don't display attached pictures in sound files.
  audio-display=no