2008-04-27 01:59:37 +00:00
|
|
|
*.o
|
|
|
|
|
*.a
|
|
|
|
|
*.d
|
2012-09-30 13:08:04 +00:00
|
|
|
*.exe
|
2008-04-27 01:59:37 +00:00
|
|
|
.depend
|
|
|
|
|
|
|
|
|
|
/config.h
|
|
|
|
|
/config.mak
|
2010-06-14 15:17:48 +00:00
|
|
|
/config.log
|
2012-10-11 00:04:08 +00:00
|
|
|
/mpv
|
2012-08-13 10:08:22 +00:00
|
|
|
/mpv.app
|
2008-04-27 01:59:37 +00:00
|
|
|
/version.h
|
2013-08-06 20:41:30 +00:00
|
|
|
/mpvcore/input/input_conf.h
|
2010-11-13 08:52:19 +00:00
|
|
|
/tags
|
|
|
|
|
/TAGS
|
2013-03-01 20:19:20 +00:00
|
|
|
/video/out/gl_video_shaders.h
|
x11: add window icon
The png file added to etc/ are taken from the link mentioned in commit
303096b, except that they have been converted to 16 bit, sRGB (with
color profile info dropped, if there was one), and transparent pixels
reset for better compression.
The file x11_icon.bin is generated by gen-x11-icon.sh. I'm adding it to
the git repo directly, because the script requires ImageMagick, and we
don't want to make building even more complicated.
The way how this is done is basically a compromise between effort
required in x11_common.c and in gen-x11-icon.sh. Ideally, x11_icon.bin
would be directly in the format as required by _NET_WM_ICON, but trying
to write the binary width/height values from shell would probably be a
nightmare, so here we go.
The zlib code in x11_common.c is lifted from demux_mkv.c, with some
modifications (like accepting a gzip header, because I don't know how to
make gzip write raw compressed data).
2013-09-01 21:26:44 +00:00
|
|
|
/video/out/x11_icon.inc
|
2012-11-09 00:06:43 +00:00
|
|
|
/demux/ebml_defs.c
|
|
|
|
|
/demux/ebml_types.h
|
2012-08-01 06:49:05 +00:00
|
|
|
/sub/osd_font.h
|
2012-11-09 00:06:43 +00:00
|
|
|
/DOCS/man/*/mpv.1
|
manpage: merge new manpage
About a year ago, ubitux converted most of the old manpage from the
hard to maintain nroff format to reStructuredText. This was not merged
back into the master repository immediately. The argument was that the
new manpage still required work to be done. However, progress was very
slow. Even worse: the old manpage wasn't updated, because it was
scheduled for deletion, and updating it would have meant useless work.
Now the situation is that the new manpage still isn't finished, and the
old manpage is grossly out of sync with the player. This is not helpful
for users. Additionally, keeping the new manpage in a separate branch,
while the normal development repository for code had the old manpage,
was very inconvenient, because you couldn't just update the
documentation in the same commit as the code.
Even though the new manpage isn't finished yet, merging it now seems to
be the best course of action. Squash-merge the manpage development
branch [1], revision e89f5dd3f2, which branches from the mplayer2
master branch after revision 159102e0cb.
Committers:
* Clément Bœsch <ubitux@gmail.com> (Initial conversion to RST.)
* Uoti Urpala <uau@mplayer2.org> (Many updates.)
* Myself (Minor edits.)
Most text of the manpage has been directly taken from the old manpage,
because this is a conversion, not a complete rewrite.
[1] http://git.mplayer2.org/uau/mplayer2.git/log/?h=man
2012-08-02 19:37:33 +00:00
|
|
|
|
