RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-25 01:37:21 +00:00
Code Issues Releases Wiki Activity
6dc1249625
mpv/DOCS
History
wm4 51e198c2a1 Merge remote-tracking branch 'origin/master' 
Conflicts:
	.gitignore
	bstr.c
	cfg-mplayer.h
	defaultopts.c
	libvo/video_out.c

The conflict in bstr.c is due to uau adding a bstr_getline function in
commit 2ba8b91a97. This function already existed in this branch.
While uau's function is obviously derived from mine, it's incompatible.
His function preserves line breaks, while mine strips them. Add a
bstr_strip_linebreaks function, fix all other uses of bstr_getline, and
pick uau's implementation.

In .gitignore, change vo_gl3_shaders.h to use an absolute path
additional to resolving the merge conflict.
2012-07-28 17:24:05 +02:00
..
man/en Merge remote-tracking branch 'origin/master' 2012-07-28 17:24:05 +02:00
tech build, codec-cfg.c: simplify builtin codecs.conf handling 2012-07-16 21:08:42 +03:00
xml docs: delete outdated translated manpages/docs 2012-07-16 22:10:28 +03:00
default.css the great MPlayer tab removal: part I 2010-04-12 10:56:17 +00:00
README

README 

#######################################
## Reading the MPlayer Documentation ##
#######################################

Thanks for reading MPlayer documentation !!!


1. For "release" version users (i.e. non-Subversion):

   a, Enter the HTML/ directory, and there you'll find the documentation,
      each language in its own subdirectory.

   b, If you prefer reading the documentation as a single big file it
      can be found in the file MPlayer.html, each language in its
      own subdirectory.

   c, If the HTML/ directory does not contain your language,
      try the subdirectories in this very same folder.


2. For "development" version users (i.e. Subversion or Subversion snapshots):

   a, Enter the xml/ directory, and read the README file there to find
      out how to build a HTML version of the XML documentation. It will
      be created in the HTML/ directory.

   b, If the xml/ directory doesn't contain your language, try the
      subdirectories in this very same folder.