From a0de98871ba4c2596a967589e44736369561bb88 Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 20 Jan 2015 15:19:24 +0100 Subject: 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 --- README.md | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'README.md') diff --git a/README.md b/README.md index 18798f5ee2..8d9a2f258c 100644 --- a/README.md +++ b/README.md @@ -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 ---------------- -- cgit v1.2.3