diff options
author | wm4 <wm4@nowhere> | 2015-01-20 15:19:24 +0100 |
---|---|---|
committer | Diogo Franco (Kovensky) <diogomfranco@gmail.com> | 2015-01-25 17:00:20 +0900 |
commit | a0de98871ba4c2596a967589e44736369561bb88 (patch) | |
tree | fb90ed18e283bcb79336766cf974724a314dbdbe | |
parent | 3711327430b23e42812346a030c19baf86ddcb90 (diff) | |
download | mpv-a0de98871ba4c2596a967589e44736369561bb88.tar.bz2 mpv-a0de98871ba4c2596a967589e44736369561bb88.tar.xz |
README: extend dependecy list, link Windows compilation docs
Also, fix vo.rst, don't want to waste a separate commit on this.
Conflicts:
DOCS/man/vo.rst
-rw-r--r-- | DOCS/man/vo.rst | 2 | ||||
-rw-r--r-- | README.md | 16 |
2 files changed, 13 insertions, 5 deletions
diff --git a/DOCS/man/vo.rst b/DOCS/man/vo.rst index a4e119224e..e15cdb1a2f 100644 --- a/DOCS/man/vo.rst +++ b/DOCS/man/vo.rst @@ -456,7 +456,7 @@ Available video output drivers are: luma scaler is used instead. Setting this option is often useless. ``lscale-down=<filter>``, ``cscale-down=<filter>`` - Like ``lscale`` and ``cscale``, but apply these filters on downscaling + Like ``lscale``, but apply these filters on downscaling instead. If these options are unset, the filter implied by ``lscale`` (and ``cscale``, respectively) will be applied. @@ -46,16 +46,23 @@ Essential dependencies (incomplete list): - gcc or clang - X development headers (xlib, X extensions, libvdpau, libGL, libXv, ...) -- Audio output development headers (libasound, pulseaudio) -- FFmpeg libraries (libavutil libavcodec libavformat libswscale libavresample) +- Audio output development headers (libasound/ALSA, pulseaudio) +- FFmpeg libraries (libavutil libavcodec libavformat libswscale libavfilter + and either libswresample or libavresample) At least FFmpeg 2.1.4 or Libav 10 is required. -- libjpeg (for screenshots) -- Lua (strictly speaking optional, but required for the OSC pseudo-GUI) +- libass +- Lua (optional, required for the OSC pseudo-GUI) +- libjpeg (optional, used for screenshots only) +- Enca (optional, for subtitle charset detection) +- vdpau and vaapi libraries for hardware decoding on Linux (optional) Libass dependencies: - gcc or clang, yasm on x86 and x86_64 - fribidi, freetype, fontconfig development headers (for libass) +- harfbuzz (optional, required for correct rendering of combining characters, + particularly for correct rendering of non-English text on OSX, and + Arabic/Indic scripts on any platform) FFmpeg dependencies: @@ -76,6 +83,7 @@ If you are running Mac OSX and using homebrew we provide [homebrew-mpv][homebrew to date formula that compiles mpv with sensible dependencies and defaults for OSX. + FFmpeg vs. Libav ---------------- |