summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/man/de/mplayer.114
-rw-r--r--DOCS/man/en/mplayer.1211
-rw-r--r--DOCS/man/fr/mplayer.12
-rw-r--r--DOCS/tech/MAINTAINERS223
-rw-r--r--DOCS/tech/binary-packaging.txt22
-rw-r--r--DOCS/tech/libmpcodecs.txt2
-rw-r--r--DOCS/tech/slave.txt8
-rw-r--r--DOCS/tech/svn-howto.txt406
-rw-r--r--DOCS/xml/en/documentation.xml1
-rw-r--r--DOCS/xml/en/faq.xml6
-rw-r--r--DOCS/xml/en/install.xml29
-rw-r--r--DOCS/xml/en/skin.xml1200
12 files changed, 127 insertions, 1997 deletions
diff --git a/DOCS/man/de/mplayer.1 b/DOCS/man/de/mplayer.1
index 4cc18bb960..f5123b1481 100644
--- a/DOCS/man/de/mplayer.1
+++ b/DOCS/man/de/mplayer.1
@@ -2195,7 +2195,6 @@ Siehe auch \-vf expand.
Schaltet das Zeichnen von SSA/ASS-Untertiteln ein.
Mit dieser Option wird libass für externe SSA/ASS-Untertitel und
Matroska-Spuren verwendet.
-Du möchtest vielleicht auch \-embeddedfonts verwenden.
.br
.I ANMERKUNG:
Wenn fontconfig eincompiliert wurde, schaltet \-ass automatisch \-fontconfig
@@ -2322,17 +2321,10 @@ Speichert den Untertitel-Substream eines VOB-Streams.
Siehe auch die Optionen \-dump*sub und \-vobsubout*.
.
.TP
-.B \-embeddedfonts (nur bei FreeType)
-Aktiviert die Extraktion von in Matroska eingebetteten Schriften (Standard:
-deaktiviert).
+.B \-noembeddedfonts
+Deaktiviert die Nutzung von in Matroska-Dateien und ASS-Untertiteln eingebetteten Schriften (Standard:
+aktiviert).
Diese Schriften können für das Rendern von SSA/ASS-Untertiteln verwendet werden
-(Option \-ass).
-Schriftdateien werden im Verzeichnis ~/.mplayer/\:fonts angelegt.
-.br
-.I ANMERKUNG:
-Bei der Verwendung von FontConfig 2.4.2 oder neuer werden eingebettete
-Schriften direkt vom Speicher geöffnet; diese Option ist per Voreinstellung
-aktiviert.
.
.TP
.B \-ffactor <Nummer>
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index 11f5c9685d..4b7a83ddc1 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -124,11 +124,6 @@ tivo://host/[list|llist|fsid]
[options]
.
.br
-.B gmplayer
-[options]
-[\-skin\ skin]
-.
-.br
.B mencoder
[options] file
[file|URL|\-] [\-o file | file://file | smb://[user:pass@]host/filepath]
@@ -182,10 +177,7 @@ more.
.PP
.B gmplayer
is MPlayer with a graphical user interface.
-It has the same options as MPlayer, however they might not all work correctly
-due to conflicts with the configuration via the GUI (stored in gui.conf).
-In particular some options might be overwritten by settings in gui.conf while
-others might end up stored permanently in gui.conf.
+It has the same options as MPlayer.
.PP
Usage examples to get you started quickly can be found at the end
of this man page.
@@ -292,8 +284,10 @@ Show progression bar, elapsed time and total duration on the OSD.
Seek to the beginning of the previous/next chapter.
.IPs "D (\-vo xvmc, \-vo vdpau, \-vf yadif, \-vf kerndeint only)"
Activate/deactivate deinterlacer.
-.IPs "A"
+.IPs "A\ \ \ \ "
Cycle through the available DVD angles.
+.IPs "c (currently -vo vdpau and -vo xv only)"
+Change YUV colorspace.
.RE
.PD 1
.PP
@@ -367,30 +361,6 @@ Seek backward/\:forward 1 minute.
.PD 1
.PP
.RS
-(The following keys are only valid if GUI support is compiled in
-and will take precedence over the keys defined above.)
-.RE
-.PP
-.PD 0
-.RS
-.IPs ENTER
-Start playing.
-.IPs "ESC\ \ "
-Stop playing.
-.IPs "l\ \ \ \ "
-Load file.
-.IPs "t\ \ \ \ "
-Load subtitle.
-.IPs "c\ \ \ \ "
-Open skin browser.
-.IPs "p\ \ \ \ "
-Open playlist.
-.IPs "r\ \ \ \ "
-Open preferences.
-.RE
-.PD 1
-.PP
-.RS
(The following keys are only valid if you compiled with TV or DVB input
support and will take precedence over the keys defined above.)
.RE
@@ -729,8 +699,6 @@ Available options are:
.RSs
.IPs "all\ \ "
all configuration files
-.IPs "gui (GUI only)"
-GUI configuration file
.IPs system
system configuration file
.IPs "user\ "
@@ -766,7 +734,6 @@ Use the given profile(s), \-profile help displays a list of the defined profiles
.TP
.B \-really\-quiet (also see \-quiet)
Display even less output and status messages than with \-quiet.
-Also suppresses the GUI error message boxes.
.
.TP
.B \-show\-profile <profile>
@@ -840,8 +807,8 @@ xover, xv (see \-vo xv:ck), xvmc (see \-vo xv:ck) and directx video output
drivers.
.
.TP
-.B \-correct\-pts (EXPERIMENTAL)
-Switches MPlayer to an experimental mode where timestamps for video frames
+.B \-correct\-pts
+Switches MPlayer to a mode where timestamps for video frames
are calculated differently and video filters which add new frames or
modify timestamps of existing ones are supported.
The more accurate timestamps can be visible for example when playing
@@ -874,15 +841,12 @@ later.
See http://www.mplayerhq.hu/\:DOCS/\:HTML/\:en/\:edl.html for details.
.
.TP
-.B \-enqueue (GUI only)
-Enqueue files given on the command line in the playlist instead of playing them
-immediately.
-.
-.TP
-.B \-fixed\-vo
-Enforces a fixed video system for multiple files (one (un)initialization for
-all files).
+.B \-nofixed\-vo
+\-fixed\-vo enforces a fixed video system for multiple files (one
+(un)initialization for all files).
Therefore only one window will be opened for all files.
+Now enabled by default, use \-nofixed\-vo to disable and create a new window
+whenever the video stream changes.
Currently the following drivers are fixed-vo compliant: gl, gl2, mga, svga, x11,
xmga, xv, xvidix and dfbmga.
.
@@ -893,12 +857,6 @@ Video filters are not applied to such frames.
For B-frames even decoding is skipped completely.
.
.TP
-.B \-(no)gui
-Enable or disable the GUI interface (default depends on binary name).
-Only works as the first argument on the command line.
-Does not work as a config-file option.
-.
-.TP
.B \-h, \-help, \-\-help
Show short summary of options.
.
@@ -1083,6 +1041,26 @@ Turns off LIRC support.
.B \-nomouseinput
Disable mouse button press/\:release input (mozplayerxp's context menu relies
on this option).
+.TP
+.B \-noordered\-chapters
+Disable support for Matroska ordered chapters.
+MPlayer will not load or search for video segments from other files,
+and will also ignore any chapter order specified for the main file.
+.
+.TP
+.B \-pts\-association\-mode <mode number>
+Select the method used to determine which container packet timestamp
+corresponds to a particular output frame from the video decoder.
+.PD 0
+.RSs
+.IPs 0
+Try to pick a working mode from the ones below automatically (default)
+.IPs 1
+Use decoder reordering functionality.
+.IPs 2
+Maintain a buffer of unused pts values and use the lowest value for the frame.
+.RE
+.PD 1
.
.TP
.B \-rtc (RTC only)
@@ -1125,20 +1103,6 @@ Use the specified device for RTC timing.
Play files in random order.
.
.TP
-.B \-skin <name> (GUI only)
-Loads a skin from the directory given as parameter below the default skin
-directories, /usr/\:local/\:share/\:mplayer/\:skins/\: and ~/.mplayer/\:skins/.
-.sp 1
-.I EXAMPLE:
-.PD 0
-.RSs
-.IPs "\-skin fittyfene"
-Tries /usr/\:local/\:share/\:mplayer/\:skins/\:fittyfene
-and afterwards ~/.mplayer/\:skins/\:fittyfene.
-.RE
-.PD 1
-.
-.TP
.B \-slave (also see \-input)
Switches on slave mode, in which MPlayer works as a backend for other programs.
Instead of intercepting keyboard events, MPlayer will read commands separated
@@ -1341,6 +1305,12 @@ Specify which chapter to start playing at.
Optionally specify which chapter to end playing at (default: 1).
.
.TP
+.B \-edition <edition ID> (Matroska, MPlayer only)
+Specify the edition (set of chapters) to use, where 0 is the first. If set to
+-1 (the default), MPlayer will choose the first edition declared as a default,
+or if there is no default, the first edition defined.
+.
+.TP
.B \-cookies (network only)
Send cookies when making HTTP requests.
.
@@ -2113,7 +2083,6 @@ Also see \-vf expand.
Turn on SSA/ASS subtitle rendering.
With this option, libass will be used for SSA/ASS
external subtitles and Matroska tracks.
-You may also want to use \-embeddedfonts.
.br
.I NOTE:
Unlike normal OSD, libass uses fontconfig by default. To disable it, use
@@ -2170,7 +2139,7 @@ The same, but hinting will only be performed if the OSD is rendered at
screen resolution and will therefore not be scaled.
.RE
.RSs
-The default value is 7 (use native hinter for unscaled OSD and no hinting otherwise).
+The default value is 5 (use light hinter for unscaled OSD and no hinting otherwise).
.RE
.PD 1
.
@@ -2238,15 +2207,10 @@ Dumps the subtitle substream from VOB streams.
Also see the \-dump*sub and \-vobsubout* options.
.
.TP
-.B \-embeddedfonts (FreeType only)
-Enables extraction of Matroska embedded fonts (default: disabled).
+.B \-noembeddedfonts
+Disables use of fonts embedded in Matroska containers and ASS scripts (default: enabled).
These fonts can be used for SSA/ASS subtitle
rendering (\-ass option).
-Font files are created in the ~/.mplayer/\:fonts directory.
-.br
-.I NOTE:
-With FontConfig 2.4.2 or newer, embedded fonts are opened directly from memory,
-and this option is enabled by default.
.
.TP
.B \-ffactor <number>
@@ -3099,6 +3063,13 @@ VESA framebuffer does not support mode changing.
Override framebuffer mode configuration file (default: /etc/\:fb.modes).
.
.TP
+.B \-force\-window\-position
+Forcefully move MPlayer's video output window to default location whenever
+there is a change in video parameters, video stream or file.
+This used to be the default behavior.
+Currently only affects X11 VOs.
+.
+.TP
.B \-fs (also see \-zoom)
Fullscreen playback (centers movie, and paints black bands around it).
Not supported by all video output drivers.
@@ -3189,12 +3160,6 @@ Places the window at the bottom right corner of the screen.
.PD 1
.
.TP
-.B \-guiwid <window ID> (also see \-wid) (GUI only)
-This tells the GUI to also use an X11 window and stick itself to the bottom
-of the video, which is useful to embed a mini-GUI in a browser (with the
-MPlayer plugin for instance).
-.
-.TP
.B \-hue <\-100\-100>
Adjust the hue of the video signal (default: 0).
You can get a colored negative of the image with this option.
@@ -3252,8 +3217,12 @@ Useful for multihead setups.
.TP
.B \-nokeepaspect
Do not keep window aspect ratio when resizing windows.
-Only works with the x11, xv, xmga, xvidix, directx video output drivers.
-Furthermore under X11 your window manager has to honor window aspect hints.
+By default MPlayer tries to keep the correct video aspect ratio by
+instructing the window manager to maintain window aspect when resizing,
+and by adding black bars if the window manager nevertheless allows
+window shape to change.
+This option disables window manager aspect hints and scales the video
+to completely fill the window without regard for aspect ratio.
.
.TP
.B "\-ontop\ "
@@ -3339,7 +3308,7 @@ the new display mode.
Enables VBI for the vesa, dfbmga and svga video output drivers.
.
.TP
-.B \-wid <window ID> (also see \-guiwid) (X11, OpenGL and DirectX only)
+.B \-wid <window ID> (X11, OpenGL and DirectX only)
This tells MPlayer to attach to an existing window.
Useful to embed MPlayer in a browser (e.g.\& the plugger extension).
This option fills the given window completely, thus aspect scaling,
@@ -3543,10 +3512,8 @@ Makes temporal deinterlacers operate both on luma and chroma (default).
Use nochroma\-deint to solely use luma and speed up advanced deinterlacing.
Useful with slow video memory.
.IPs pullup
-Try to skip deinterlacing for progressive frames, useful for watching
-telecined content, needs fast video hardware for high resolutions.
-Only works with motion adaptive temporal deinterlacing.
-.IPs colorspace
+Try to apply inverse telecine, needs motion adaptive temporal deinterlacing.
+.IPs colorspace=<0-3>
Select the color space for YUV to RGB conversion.
In general BT.601 should be used for standard definition (SD) content and
BT.709 for high definition (HD) content.
@@ -3564,18 +3531,58 @@ Use ITU-R BT.709 color space.
.IPs 3
Use SMPTE-240M color space.
.RE
-.IPs hqscaling
+.IPs hqscaling=<0-9>
.RSss
.IPs 0
Use default VDPAU scaling (default).
.IPs 1\-9
Apply high quality VDPAU scaling (needs capable hardware).
.RE
-.IPs force\-mixer
-Forces the use of the VDPAU mixer, which implements all above options (default).
-Use noforce\-mixer to allow displaying BGRA colorspace.
-(Disables all above options and the hardware equalizer
-if image format BGRA is actually used.)
+.IPs studio
+Output video in studio level RGB (16-235).
+This is what TVs and video monitors generally expect.
+By default PC level RGB (0-255) suitable for PC monitors is used.
+Providing studio level output to a device expecting PC level input results in
+grey blacks and dim whites, the reverse in crushed blacks and whites.
+.IPs fps=<number>
+Override autodetected display refresh rate value (the value is needed for framedrop to allow video playback rates higher than display refresh rate, and for vsync-aware frame timing adjustments).
+Default 0 means use autodetected value.
+A positive value is interpreted as a refresh rate in Hz and overrides the autodetected value.
+A negative value disables all timing adjustment and framedrop logic.
+.IPs queuetime_windowed=<number>
+.IPs queuetime_fs=<number>
+Use VDPAU's presentation queue functionality to queue future video frame
+changes at most this many milliseconds in advance (default: 50).
+See below for additional information.
+.IPs output_surfaces=<2-15>
+Allocate this many output surfaces to display video frames (default: 3).
+See below for additional information.
+.RE
+.RS
+.sp 1
+Using the VDPAU frame queueing functionality controlled by the queuetime
+options makes MPlayer's frame flip timing less sensitive to system CPU load
+and allows MPlayer to start decoding the next frame(s) slightly earlier
+which can reduce jitter caused by individual slow-to-decode frames.
+However the NVIDIA graphics drivers can make other window behavior such as
+window moves choppy if VDPAU is using the blit queue (mainly happens
+if you have the composite extension enabled) and this feature is active.
+If this happens on your system and it bothers you then you can set the
+queuetime value to 0 to disable this feature.
+The settings to use in windowed and fullscreen mode are separate because there
+should be less reason to disable this for fullscreen mode (as the driver issue
+shouldn't affect the video itself).
+.sp 1
+You can queue more frames ahead by increasing the queuetime values and the
+output_surfaces count (to ensure enough surfaces to buffer video for a
+certain time ahead you need at least as many surfaces as the video has
+frames during that time, plus two).
+This could help make video smoother in some cases.
+The main downsides are increased video RAM requirements for the surfaces
+and laggier display response to user commands (display changes only become
+visible some time after they're queued). The graphics driver implementation may
+also have limits on the length of maximum queuing time or number of queued
+surfaces that work well or at all.
.RE
.PD 1
.
@@ -4463,8 +4470,6 @@ Each file takes the frame number padded with leading zeros as name.
.IPs z=<0\-9>
Specifies the compression level.
0 is no compression, 9 is maximum compression.
-.IPs outdir=<dirname>
-Specify the directory to save the PNG files to (default: ./).
.IPs alpha (default: noalpha)
Create PNG files with an alpha channel.
Note that MPlayer in general does not support alpha, so this will only
@@ -11138,6 +11143,10 @@ A value of "noconv" means no conversion.
Directory where MPlayer looks for user settings.
.
.TP
+.B MPLAYER_LOCALEDIR
+Directory where MPlayer looks for gettext translation files (if enabled).
+.
+.TP
.B MPLAYER_VERBOSE (also see \-v and \-msglevel)
Set the initial verbosity level across all message modules (default: 0).
The resulting verbosity corresponds to that of \-msglevel 5 plus the
@@ -11387,14 +11396,6 @@ MEncoder user settings
input bindings (see '\-input keylist' for the full list)
.
.TP
-~/.mplayer/\:gui.conf
-GUI configuration file
-.
-.TP
-~/.mplayer/\:gui.pl
-GUI playlist
-.
-.TP
~/.mplayer/\:font/
font directory (There must be a font.desc file and files with .RAW extension.)
.
diff --git a/DOCS/man/fr/mplayer.1 b/DOCS/man/fr/mplayer.1
index e5d1ccbb37..3fee7fe302 100644
--- a/DOCS/man/fr/mplayer.1
+++ b/DOCS/man/fr/mplayer.1
@@ -4646,8 +4646,6 @@ Ne gère que les formats RGB et BGR 24 bits/pixel.
.IPs z=<0\-9>
Définit le taux de compression.
0 équivaut à pas de compression et 9 à la compression maximale.
-.IPs outdir=<chemin>
-Définit le répertoire où sauver les fichiers PNG (par défaut\ ./).
.IPs alpha (par défaut\ : noalpha)
Crée un fichier PNG avec un canal alpha.
Notez que MPlayer ne gère en général pas les canaux alpha, donc cette
diff --git a/DOCS/tech/MAINTAINERS b/DOCS/tech/MAINTAINERS
deleted file mode 100644
index b9b84d8fc2..0000000000
--- a/DOCS/tech/MAINTAINERS
+++ /dev/null
@@ -1,223 +0,0 @@
-__________________________________________
-MPlayer code and documentation maintainers
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-NOTE: This file (should) contain the up-to-date list of the maintainers of
-each part/module of the mplayer svn / source tree, including docs & homepage.
-You should NOT commit non-trivial changes without the agreement by the
-maintainer of the given part. The job of the maintainer is commenting,
-refusing or accepting patches, suggestions.
-If you're listed here as maintainer of one or more parts, but you don't want
-it to be so, tell us and you will be removed... this list has been created
-based on maillist/svn activity. It may be wrong.
-
-Always send the patches (first read DOCS/tech/patches.txt), comments to
-the mplayer-dev-eng mailing list!!!
-
-Everyone is free to nominate himself/herself for a maintainership.
-
-Administration:
- * Project server: Attila Kinali, Diego Biurrun
- * Mailing lists: Guillaume Poirier
- * Patch backlog tracking: Andrew Buehler, "The Wanderer"
-
-Homepage:
- * Design: Diego Biurrun
- * Content: Diego Biurrun
- * Codec packages: Roberto Togni
-
-Documentation:
- * MPlayer: Diego Biurrun
- * MEncoder: Guillaume Poirier
- * man page: Diego Biurrun
- * translation coordination: Sebastian Krämer
- * input layer, LIRC, slave mode docs: Alban Bedel
- * tech/* docs: None
- * tech/* documentation docs: Diego Biurrun
-
-Man page translations:
- * Czech: Jiri Heryan
- * French: Guillaume Poirier
- * German: Sebastian Krämer
- * Hungarian: Gabor Mizda
- * Italian: Paolo Tresoldi
- * Polish: Waclaw Schiller
- * Spanish: None
- * Russian: Vladimir Voroshilov
-
-Documentation translations:
- * Czech: Jiri Heryan
- * French: Guillaume Poirier
- * German: Sebastian Krämer
- * Hungarian: Gabor Mizda
- * Italian: Paolo Tresoldi
- * Polish: Waclaw Schiller
- * Spanish: None
- * Chinese (simplified): unmaintained, outdated
- * Italian: unmaintained, outdated
- * Russian: Vladimir Voroshilov
-
-Platforms/ports:
- * Debian packaging: Diego Biurrun
- * Red Hat/RPM packaging: Dominik Mierzejewski
- * FreeBSD: Vladimir Kushnir, Nexus
- * BSD/OS: Steven Schultz
- * NetBSD: Bernd Ernesti
- * OpenBSD: Björn Sandell
- * Solaris: Derek Lewis
- * Win32/Cygwin/MinGW: Sascha Sommer, Joey Parrish
- * MPlayer OS X frontend: Nicolas Plourde, Adrian Stutz
- * Mac OS X: None
- * AIX: Derek Lewis
-
-MPlayer code:
- * build system: Diego Biurrun
- * A-V sync code, MPlayer core: Uoti Urpala
- * MEncoder core: None (unmaintained)
- * libmpdemux: Roberto Togni, Nico Sabbi
- * libmpcodecs: Roberto Togni
- * TV input/capture: Vladimir Voroshilov
- * TV teletext: Vladimir Voroshilov
- * network streaming: Roberto Togni, Nico Sabbi, Benjamin Zores
- * DVD/VOB subtitles: None
- * config files & commandline parser: Alban Bedel
- * playtree, input layer: Alban Bedel
- * libswscale: Michael Niedermayer, Luca Abeni
- * DVB support: Nico Sabbi
- * GUI: None
- * GUI skins: Diego Biurrun
- * EDL code: Oded Shimon
-
-Imported libs/projects:
- * FFmpeg: Michael Niedermayer
- * VIDIX core: Benjamin Zores
- * mp3lib: None
- * loader: None
- * libmpeg2: None
- * libdvdcss: Diego Biurrun
- * libdvdread: Diego Biurrun
- * libfaad2: None
- * realrtsp: Roberto Togni
- * librtsp: Benjamin Zores
- * freesdp: Benjamin Zores
- * libass: Evgeniy Stepanov
-
-demuxers:
- * demux_fli.c - Roberto Togni
- * demux_gif.c - Joey Parrish
- * demux_lavf.c - Michael Niedermayer
- * demux_mkv.c - Moritz Bunkus, Aurelien Jacobs
- * demux_nsv.c - Roberto Togni
- * demux_ogg.c - Moritz Bunkus
- * demux_realaud.c - Roberto Togni
- * demux_rtp* - Ross Finlayson
- * demux_mpg and demux_ts - Nico Sabbi
- * demux_mpc.c - Reimar Döffinger
-
-muxers:
- * muxer_lavf.c - Michael Niedermayer
- * muxer_mpeg.c - Nico Sabbi
-
-streams:
- * stream_pvr.c - Benjamin Zores
- * stream_udp.c - Benjamin Zores
- * stream_rtp.c - Benjamin Zores
- * stream_rtsp.c - Benjamin Zores
- * stream_radio.c - Vladimir Voroshilov
- * stream_dvb.c - Nico Sabbi
- * stream_dvd.c - Nico Sabbi
- * stream_dvdnav.c - Nico Sabbi and Benjamin Zores
-
-codec support:
- * FFmpeg: Michael Niedermayer
- * Xvid: Ivan Kalvachev
- * x264: Loren Merritt
- * musepack, speex: Reimar Döffinger
-
-video filters:
- * general: Richard Felker, Michael Niedermayer
- * vf_filmdint.c - Zoltan Hidvegi
- * vf_blackframe.c - Ivo van Poorten
- * vf_zrmjpeg.c - Rik Snel
- * all filters written by Michael Niedermayer - Michael Niedermayer
-
-audio filters:
- * general: Alex Beregszaszi
- * af_ladspa.c - Ivo van Poorten
- * af_equalizer.c - None
- * af_karaoke.c - None
-
-audio encoders:
- * ae_toolame.c, ae_twolame.c and ae_faac.c - Nico Sabbi
-
-libvo drivers:
- * vo_3dfx.c - OBSOLETED, use xv or tdfxfb
- * vo_aa.c - Alban Bedel
- * vo_caca.c - Howell Tam (Pigeon)
- * vo_bl.c - Rik Snel
- * vo_corevideo.m - Adrian Stutz
- * vo_cvidix.c - Sascha Sommer
- * vo_dga.c - None
- * vo_dfbmga.c - Ville Syrjälä
- * vo_direct3d.c - Georgi Petrov
- * vo_directfb[2].c - Jiri Svoboda
- * vo_directx.c - Sascha Sommer
- * vo_dxr2.c - Alban Bedel
- * vo_dxr3.c - None
- * vo_fbdev.c - Joey Parrish
- * vo_fbdev2.c - Joey Parrish
- * vo_ggi.c - Christoph Egger
- * vo_gif89a.c - Joey Parrish
- * vo_gl.c - Reimar Döffinger
- * vo_gl2.c - Reimar Döffinger
- * vo_ivtv.c - Benjamin Zores
- * vo_jpeg.c - Ivo van Poorten
- * vo_md5sum.c - Ivo van Poorten
- * vo_mga.c - None
- * vo_mpegpes.c - None
- * vo_null.c - None
- * vo_png.c - Felix Bünemann
- * vo_pnm.c - Ivo van Poorten
- * vo_quartz.c - Nicolas Plourde
- * vo_sdl.c - Felix Bünemann
- * vo_svga.c - Ivan Kalvachev
- * vo_tdfxfb.c - Alban Bedel
- * vo_tga.c - Daniele Forghieri
- * vo_vesa.c - Aurelien Jacobs
- * vo_wii.c - Benjamin Zores
- * vo_winvidix.c - Sascha Sommer
- * vo_x11.c - Alexander Strasser
- * vo_xmga.c - None
- * vo_xover.c - Alban Bedel
- * vo_xv.c - Alexander Strasser
- * vo_xvidix.c - None
- * vo_xvmc.c - Ivan Kalvachev
- * vo_yuv4mpeg.c - Robert Kesterson
- * vo_zr.c - Rik Snel
- * vo_zr2.c - Rik Snel
-
- * x11_common.c - Alexander Strasser, Reimar Döffinger
- * w32_common.c - Reimar Döffinger
-
-libao2 drivers:
- * ao_alsa5.c - None
- * ao_alsa.c - Clemens Ladisch
- * ao_arts.c - None
- * ao_coreaudio.c - None
- * ao_dsound.c - None
- * ao_dxr2.c - None
- * ao_esd.c - None
- * ao_ivtv.c - Benjamin Zores
- * ao_jack.c - Reimar Döffinger
- * ao_mpegpes.c - None
- * ao_nas.c - Tobias Diedrich
- * ao_null.c - None
- * ao_openal.c - Reimar Döffinger
- * ao_oss.c - None
- * ao_pcm.c - None
- * ao_plugin.c - None
- * ao_pulse.c - None
- * ao_sdl.c - None
- * ao_sgi.c - None
- * ao_sun.c - None
- * ao_win32.c - Sascha Sommer
diff --git a/DOCS/tech/binary-packaging.txt b/DOCS/tech/binary-packaging.txt
index 3aec8b2312..6cc485ef2b 100644
--- a/DOCS/tech/binary-packaging.txt
+++ b/DOCS/tech/binary-packaging.txt
@@ -66,9 +66,6 @@ the following features MUST be included in any official binary package:
(*) if available for your OS/hardware
-There is great demand for the GUI, so it SHOULD be included, but it MUST
-come as a separate package (see Tips and Tricks for details).
-
Including other features, like LIVE.COM streaming or JACK support, is
acceptable. They SHOULD, however, be build-time configurable, with the
default build configuration containing the above set.
@@ -111,7 +108,6 @@ for Red Hat and Fedora RPMs I am using FHS-compliant paths:
/usr/share/doc/mplayer-version/ docs
/usr/share/man/man1/ man page
/usr/share/man/XX/man1/ translated man page
-/usr/share/mplayer/skins/ GUI skins
You MUST NOT include the codecs.conf file in your package. It is useful
only for development purposes and often causes obscure problems for users.
@@ -129,13 +125,9 @@ install only what you need. This is the layout I am using for Red Hat and
Fedora RPMs:
mencoder contains MEncoder binary (mencoder)
-mplayer contains MPlayer binary without GUI (mplayer),
- config files, man pages and documentation;
- required by mplayer-gui
+mplayer contains MPlayer binary config files, man pages and
+ documentation;
mplayer-codecs-* contain binary codecs available from MPlayer's site
-mplayer-gui contains MPlayer binary with GUI (gmplayer);
- contains default skin (Blue)
-mplayer-skin-* contain various MPlayer GUI skins
There is no strict policy for now, just use your common sense.
@@ -200,14 +192,8 @@ ao=alsa,
Tips and tricks
~~~~~~~~~~~~~~~
-In my package layout, mplayer and mplayer-gui can be installed at the same
-time, because they contain differently named binaries and there is no
-conflict. The trick is to build MPlayer once with --enable-gui, rename the
-resulting binary to "gmplayer" and then build it again, without GUI, but
-keeping the rest of ./configure options the same.
-
-To provide man pages for all MPlayer suite binaries (mplayer, gmplayer,
-mencoder), you can use man-links instead of regular symbolic links.
+To provide man pages for all MPlayer suite binaries (mplayer, mencoder), you
+can use man-links instead of regular symbolic links.
Creating a mencoder man page linked to mplayer is as simple as:
echo ".so mplayer.1" >> mencoder.1
diff --git a/DOCS/tech/libmpcodecs.txt b/DOCS/tech/libmpcodecs.txt
index 3b6f2f261e..b7378e8f2c 100644
--- a/DOCS/tech/libmpcodecs.txt
+++ b/DOCS/tech/libmpcodecs.txt
@@ -197,7 +197,7 @@ static int open(vf_instance_t *vf, char* args)
return 1;
}
-Functions in struct vf_instance:
+Functions in vf_instance:
NOTE: All these are optional, their function pointer is either NULL or points
to a default implementation. If you implement them, don't forget to set
diff --git a/DOCS/tech/slave.txt b/DOCS/tech/slave.txt
index a2e249dbe5..f03339aac3 100644
--- a/DOCS/tech/slave.txt
+++ b/DOCS/tech/slave.txt
@@ -285,6 +285,10 @@ set_mouse_pos <x> <y>
set_property <property> <value>
Set a property.
+set_property_osd <property> <value>
+ Same as above, but show the new value on the OSD in the standard
+ manner defined for that property (if any).
+
speed_incr <value>
Add <value> to the current playback speed.
@@ -299,6 +303,10 @@ step_property <property> [value] [direction]
not given or zero. The direction is reversed if direction is less
than zero.
+step_property_osd <property> [value] [direction]
+ Same as above, but show the new value on the OSD in the standard
+ manner defined for that property (if any).
+
stop
Stop playback.
diff --git a/DOCS/tech/svn-howto.txt b/DOCS/tech/svn-howto.txt
deleted file mode 100644
index 36a4a6b25c..0000000000
--- a/DOCS/tech/svn-howto.txt
+++ /dev/null
@@ -1,406 +0,0 @@
-
-About Subversion write access:
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Before everything else, you should know how to use Subversion properly.
-Luckily Subversion comes with excellent documentation.
-
- svn help
-
-shows you the available subcommands,
-
- svn help <command>
-
-shows information about the subcommand <command>.
-
-The most comprehensive manual is the book "Version Control with Subversion"
-by Ben Collins-Sussman, Brian W. Fitzpatrick and C. Michael Pilato. It can
-be viewed online at
-
-http://svnbook.org/
-
-For more information about the Subversion project, visit
-
-http://subversion.apache.org/
-
-Consult these resources whenever you have problems, they are quite exhaustive.
-
-You do not need a special checkout that works through ssh or similar in order
-to be able to commit changes. All you need is the username and password pair
-that you received from the MPlayer Subversion server admin.
-
-What follows now is a basic introduction to Subversion and some MPlayer-specific
-guidelines. Read it at least once, if you are granted commit privileges to the
-MPlayer project you are expected to be familiar with these rules.
-
-
-
-I. BASICS:
-==========
-
-0. Get Subversion:
-
- The MPlayer project server runs Subversion 1.5. For optimal compatibility
- you should use version 1.5 or later.
-
-
-1. Checking out the source tree:
-
- svn checkout svn://svn.mplayerhq.hu/mplayer/trunk/ <target>
-
- This will put the MPlayer sources into the directory <target>.
-
-
-2. Updating the source tree to the latest revision:
-
- svn update
-
- pulls in the latest changes from the repository to your working directory.
-
-
-3. Adding/removing files/directories:
-
- svn add <filename/dirname>
- svn delete <filename/dirname>
-
- Subversion needs to get notified of all changes you make to your working
- directory.
-
-
-4. Showing modifications:
-
- svn diff <filename(s)>
-
- will show all local modifications in your working directory as unified diff.
-
-
-5. Inspecting the changelog:
-
- svn log <filename(s)>
-
- You may also find viewvc, a web frontend for Subversion, helpful. It's often
- more comfortable than using 'svn log' and 'svn diff'. Find it here:
- http://svn.mplayerhq.hu/mplayer/trunk/
-
-
-6. Checking source tree status:
-
- svn status
-
- detects all the changes you made and lists what actions will be taken in case
- of a commit (additions, modifications, deletions, etc.).
-
-
-7. Committing:
-
- svn update
-
- Run 'svn update' before committing to make sure there were no changes to the
- files you worked on in the meantime. Afterwards look at the output of
-
- svn diff <filename(s)>
-
- to doublecheck your changes before committing to avoid trouble later on. All
- experienced developers do this on each and every commit, no matter how small.
- Every one of them has been saved from looking like a fool by this many times.
- It's very easy for stray debug output or cosmetic modifications to slip in,
- please avoid problems through this extra level of scrutiny.
-
- For cosmetics-only commits you should get (almost) empty output from
-
- svn diff -x -uwb <filename(s)>
-
- Also check the output of
-
- svn status
-
- to make sure you did not forget to 'svn add' some files (they will be marked
- with '?').
-
- Once you have made sure everything is fine
-
- svn commit <filename(s)>
-
- propagates your stuff to the repository. If you have made several independent
- changes, commit them separately, not at the same time.
-
- When prompted for a password, type the password you got assigned by the
- project admins. By default, Subversion caches all authentication tokens.
- This behavior can be disabled by setting both 'store-passwords' and
- 'store-auth-creds' to "no" in ~/.subversion/config. You might need to remove
- previous cache files, which are located in ~/.subversion/auth, by hand.
-
- You will be prompted for a log message in an editor, which is either specified
- by --editor-cmd on the command line, set in your personal configuration file
- (~/.subversion/config) or set by one of the following environment variables:
- SVN_EDITOR, VISUAL or EDITOR.
-
- Log messages should be concise but descriptive. Explain why you made a change,
- what you did will be obvious from the changes themselves most of the time.
- Saying just "bug fix" or "10l" is bad. Remember that people of varying skill
- levels look at and educate themselves while reading through your code. Don't
- include filenames in log messages, Subversion provides that information.
-