diff options
78 files changed, 2008 insertions, 3480 deletions
@@ -808,7 +808,7 @@ Ulion <ulion2002 gmail.com> Urpala, Uoti (uau) <uoti.urpala@pp1.inet.fi> * A/V sync fixes -Vajna, Miklós (VMiklos) <mamajom@axelero.hu> +Vajna, Miklós (VMiklos) <vmiklos@frugalware.org> * TOOLS/divx2svcd author * TOOLS/ directory documentation @@ -37,6 +37,7 @@ MPlayer (1.0) * Brooktree YUV 4:1:1 Raw (Y41P) via binary DLL * many rare/obscure fourccs for known formats added * lower priority for binary Linux rv3040 codecs due to bugs + * remove native NuppelVideo decoder, use lavc instead Demuxers: * -lavfdopts cryptokey allows decrypting MXF and ASF files @@ -55,6 +56,7 @@ MPlayer (1.0) * support seeking in multirate RealMedia files * FLAC speedup in lavf demuxer * MNG demuxer + * remove native NuppelVideo demuxer, use lavf demuxer instead Filters: * vf_ow new overcomplete wavelet denoiser @@ -146,6 +148,7 @@ MPlayer (1.0) * removed unnecessary code from vo x11, xv, xvmc * add OS/2 DART audio driver (-ao dart) * add VDPAU video output + * add OS/2 KVA video driver (-vo kva) MEncoder: * check for system-wide configuration file in MEncoder @@ -166,6 +169,8 @@ MPlayer (1.0) * libdvdcss updated to 1.2.10, now same as upstream version * fix -endchapter support again for -dump* options * add startup volume option + * add option to disable default key binds + * change default OSD and subtitle font size to a smaller default libass: * various fixes and updates to match VSFilter renderer @@ -9,22 +9,24 @@ from several external sources: Name: FFmpeg Version: Subversion HEAD -Homepage: http://www.ffmpeg.org +URL: http://www.ffmpeg.org Directory: libavcodec, libavformat, libavutil, libpostproc Copyright: Many, see individual files for copyright notices. License: GNU Lesser General Public License, some parts GNU General Public License, GNU General Public License when combined + Name: FAAD2 Version: 2.1 beta (20040915 CVS snapshot) + fixes and portability patches -Homepage: http://www.audiocoding.com +URL: http://www.audiocoding.com Directory: libfaad2 Copyright: 2003-2004 M. Bakker, Ahead Software AG, http://www.nero.com License: GNU General Public License + Name: GSM 06.10 library Version: patchlevel 10 -Homepage: http://kbs.cs.tu-berlin.de/~jutta/toast.html +URL: http://kbs.cs.tu-berlin.de/~jutta/toast.html Directory: libmpcodecs/native/ Copyright: 1992 by Jutta Degener and Carsten Bormann, TU Berlin License: permissive, see libmpcodecs/native/xa_gsm.c @@ -32,7 +34,7 @@ License: permissive, see libmpcodecs/native/xa_gsm.c Name: liba52 Version: 0.7.4 + patches -Homepage: http://liba52.sourceforge.net/ +URL: http://liba52.sourceforge.net/ Directory: liba52 Copyright: 1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca> 2000-2001 Michel Lespinasse <walken@zoy.org> @@ -41,28 +43,41 @@ Copyright: 1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca> 2004 Romain Dolbeau <romain@dolbeau.org> License: GNU General Public License + Name: libdvdcss Version: 1.2.10 -Homepage: http://developers.videolan.org/libdvdcss/ +URL: http://developers.videolan.org/libdvdcss/ Directory: libdvdcss Copyright: 1998-2008 VideoLAN License: GNU General Public License + Name: libdvdread -Version: 0.9.7 + patches -Homepage: http://www.dtek.chalmers.se/groups/dvd/development.shtml -Directory: libdvdread +Version: Subversion HEAD +URL: svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdread/src +Directory: libdvdread4 Copyright: 1998, 1999 Eric Smith <eric@brouhaha.com> 1999 Christian Wolff for convergence integrated media - 2000-2001 Billy Biggs <vektor@dumbterm.net>, + 2000-2004 Billy Biggs <vektor@dumbterm.net>, 2001-2002 Samuel Hocevar <sam@zoy.org>, - 2000-2003 Björn Englund <d4bjorn@dtek.chalmers.se>, - 2000-2003 HÃ¥kan Hjort <d95hjort@dtek.chalmers.se> + 2000-2004 Björn Englund <d4bjorn@dtek.chalmers.se>, + 2000-2004 HÃ¥kan Hjort <d95hjort@dtek.chalmers.se> License: GNU General Public License + +Name: libdvdnav +Version: Subversion HEAD from +URL: svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdnav/src +Directory: libdvdnav +Copyright: 2000, 2001 Martin Norbäck, HÃ¥kan Hjort + 2000-2004 Rich Wareham <richwareham@users.sourceforge.net> + 2001-2004 the dvdnav project +License: GNU General Public License + + Name: libmpeg2 Version: 0.5.1 + patches -Homepage: http://libmpeg2.sourceforge.net/ +URL: http://libmpeg2.sourceforge.net/ Directory: libmpeg2 Copyright: 1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca> 2000-2004 Michel Lespinasse <walken@zoy.org> @@ -72,25 +87,28 @@ Copyright: 1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca> 2003 Peter Gubanov <peter@elecard.net.ru> License: GNU General Public License + Name: mpg123 Version: 0.59s + significant changes -Homepage: http://www.mpg123.de/ +URL: http://www.mpg123.de/ Directory: mp3lib Copyright: 1995-1999 by Michael Hipp 2004 Romain Dolbeau <romain@dolbeau.org> 2006 Zuxy Meng <zuxy.meng@gmail.com License: GNU General Public License + Name: Tremor Version: 1.0 + parts CVS from December 2004 + patches -Homepage: http://xiph.org/ +URL: http://xiph.org/ Directory: tremor Copyright: 1994-2002, Xiph.org Foundation http://www.xiph.org/ License: BSD-like, see tremor/COPYING + Name: avifile DLL loader Version: 0.47 + patches + CVS updates -Homepage: http://avifile.sourceforge.net/ +URL: http://avifile.sourceforge.net/ Directory: loader/ Copyright: 1993 Robert J. Amstadt 1994 Eric Youndale & Erik Bos @@ -101,68 +119,77 @@ Copyright: 1993 Robert J. Amstadt 2000-2001 Eugene Kuznetsov (divx@euro.ru) License: GNU General Public License + Name: dvbstream Version: 0.4.3-pre3 (CVS checkout) -Homepage: http://sourceforge.net/projects/dvbtools/ +URL: http://sourceforge.net/projects/dvbtools/ Directory: stream/dvbin.h stream/rtp.[ch] stream/stream_dvb.c Copyright: 2001-2002 Dave Chapman <dave@dchapman.com> License: GNU General Public License + Name: librtsp Version: xine CVS 2003/04/10 + patches -Homepage: http://www.xinehq.de +URL: http://www.xinehq.de Directory: stream/librtsp/ Copyright: 2000-2002 the xine project License: GNU General Public License + Name: realrtsp Version: xine CVS 2003/04/17 + patches -Homepage: http://www.xinehq.de +URL: http://www.xinehq.de Directory: stream/realrtsp/ Copyright: 2002 the xine project License: GNU General Public License + Name: pnm protocol implementation Version: xine CVS 2002/12/26 + patches -Homepage: http://www.xinehq.de +URL: http://www.xinehq.de Directory: stream/pnm.[ch] Copyright: 2000-2002 the xine project License: GNU General Public License + Name: id3edit Version: 1.9 + patches -Homepage: http://id3edit.sourceforge.net/ +URL: http://id3edit.sourceforge.net/ Directory: libmpdemux/genres.h Copyright: 2001 Jason Carter License: GNU General Public License + Name: FreeSDP Version: 0.4.1 -Homepage: https://savannah.nongnu.org/projects/freesdp/ +URL: https://savannah.nongnu.org/projects/freesdp/ Directory: stream/freesdp/ Copyright: 2001-2003 Federico Montesino Pouzols <fedemp@suidzer0.org> License: GNU General Public License + Name: MJPEG Tools Version: post 2001-12-03 release or CVS snapshot -Homepage: http://mjpeg.sourceforge.net/ +URL: http://mjpeg.sourceforge.net/ Directory: libmpdemux/yuv4mpeg* Copyright: 2001 Matthew J. Marjanovic <maddog@mir.com> 2001 Andrew Stevens <andrew.stevens@philips.com> License: GNU General Public License + Name: NuppelVideo / RTJPEG Version: 0.52a + patches -Homepage: http://web.archive.org/web/20060219034716/http://frost.htu.tuwien.ac.at/~roman/nuppelvideo/ -Directory: libmpcodecs/native/rtjpegn.[ch] libmpdemux/nuppelvideo.h +URL: http://web.archive.org/web/20060219034716/http://frost.htu.tuwien.ac.at/~roman/nuppelvideo/ +Directory: libmpcodecs/native/rtjpegn.[ch] Copyright: 1998 Justin Schoeman (justin@suntiger.ee.up.ac.za) 1998, 1999 Joerg Walter <trouble@moes.pmnet.uni-oldenburg.de> 1999 Wim Taymans <wim.taymans@tvd.be> License: GNU General Public License + Name: ReactOS Version: r25937 -Homepage: http://www.reactos.org/ +URL: http://www.reactos.org/ Directory: vidix/dhahelperwin/ntverp.h vidix/dhahelperwin/common.ver Copyright: Alex Ionescu (alex.ionescu@reactos.org) License: GNU General Public License diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 3f250fced5..3b6c1873d8 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -960,6 +960,8 @@ Device to be used for Apple IR Remote (default is autodetected, Linux only). Delay in milliseconds before we start to autorepeat a key (0 to disable). .IPs ar-rate Number of key presses to generate per second on autorepeat. +.IPs (no)default-binds +Use the key bindings that MPlayer ships with by default. .IPs keylist Prints all keys that can be bound to commands. .IPs cmdlist @@ -1131,6 +1133,8 @@ by a newline (\\n) from stdin. .I NOTE: See \-input cmdlist for a list of slave commands and DOCS/tech/slave.txt for their description. +Also, this is not intended to disable other inputs, e.g. via the video window, +use some other method like \-input nodefault\-binds:conf=/dev/null for that. . .TP .B \-softsleep @@ -2249,14 +2253,14 @@ Use this if commas in subtitles are shown at the start of a sentence instead of at the end. . .TP -.B \-font <path to font.desc file> +.B \-font <path to font.desc file, path to font (FreeType), font pattern (Fontconfig)> Search for the OSD/\:SUB fonts in an alternative directory (default for normal fonts: ~/\:.mplayer/\:font/\:font.desc, default for FreeType fonts: ~/.mplayer/\:subfont.ttf). .br .I NOTE: With FreeType, this option determines the path to the text font file. -With fontconfig, this option determines the fontconfig font name. +With Fontconfig, this option determines the Fontconfig font pattern. .sp 1 .I EXAMPLE: .PD 0 @@ -2266,6 +2270,8 @@ With fontconfig, this option determines the fontconfig font name. \-font ~/\:.mplayer/\:arialuni.ttf .br \-font 'Bitstream Vera Sans' +.br +\-font 'Bitstream Vera Sans:style=Bold' .RE .PD 1 . @@ -2504,8 +2510,8 @@ Currently useless. Same as \-audiofile, but for subtitle streams (OggDS?). . .TP -.B \-subfont <filename> (FreeType only) -Sets the subtitle font. +.B \-subfont <path to font (FreeType), font pattern (Fontconfig)> (FreeType only) +Sets the subtitle font (see \-font). If no \-subfont is given, \-font is used. . .TP @@ -3449,6 +3455,9 @@ Apply a noise reduction algorithm to the video (default: 0, no noise reduction). .IPs deint=<0\-4> Chooses the deinterlacer (default: 0). All modes > 0 respect \-field\-dominance. +.br +.I NOTE: +Values > 2 delay the video output by one frame. .RSss .IPs 0 No deinterlacing. @@ -3587,6 +3596,23 @@ Try this option if you have display problems. .PD 1 . .TP +.B kva (OS/2 only) +Video output driver that uses the libkva interface. +.PD 0 +.RSs +.IPs snap +Force SNAP mode. +.IPs wo +Force WarpOverlay! mode. +.IPs dive +Force DIVE mode. +.IPs (no)t23 +Enable/disable workaround for T23 laptop (default: \-not23). +Try to enable this option if your video card supports upscaling only. +.RE +.PD 1 +. +.TP .B quartz (Mac OS X only) Mac OS X Quartz video output driver. Under some circumstances, it might be more efficient to force a diff --git a/DOCS/man/fr/mplayer.1 b/DOCS/man/fr/mplayer.1 index d042125311..13f233964f 100644 --- a/DOCS/man/fr/mplayer.1 +++ b/DOCS/man/fr/mplayer.1 @@ -1,4 +1,4 @@ -.\" synced with r28807 +.\" synced with r28950 .\" Encoding: iso-8859-1 .\" MPlayer (C) 2000-2009 MPlayer Team .\" The English man page was/is done by Gabucino, Diego Biurrun, Jonas Jermann @@ -1009,6 +1009,8 @@ d'une touche (0 pour désactiver). .IPs ar-rate Combien de frappes par seconde pendant la répétition automatique. +.IPs (no)default-binds +Répond aux touches de contrôle par défaut de MPlayer. .IPs keylist Affiche toutes les touches pouvant être attachées. .IPs cmdlist @@ -1193,6 +1195,9 @@ commandes séparées par un retour chariot (\\n) via l'entrée stdin. .I NOTE\ : Voir \-input cmdlist pour une liste des commandes esclaves, et DOCS/tech/slave.txt pour leur description. +De plus, cette option n'est pas vouée à désactiver les autres entrées, +comme via la fenêtre vidéo\ ; pour cela, utilisez d'autres méthodes, comme +\-input nodefault\-binds:conf=/dev/null. . .TP .B \-softsleep @@ -2354,14 +2359,14 @@ les sous-titres. phrases au lieu de la fin. . .TP -.B \-font <chemin vers le fichier font.desc> +.B \-font <chemin vers le fichier font.desc, la police (FreeType), motif de police (Fontconfig)> Recherche les polices OSD/\:SUB dans un répertoire particulier (par défaut pour les polices normales: ~/\:.mplayer/\:font/\:font.desc, pour les polices FreeType: ~/.mplayer/\:subfont.ttf). .br .I NOTE: Avec FreeType, cette option détermine le chemin vers le fichier de polices. -Avec Fontconfig, cette option détermine le nom de police fontconfig. +Avec Fontconfig, cette option détermine le motif de police Fontconfig. .sp 1 .I EXEMPLE: .PD 0 @@ -2370,7 +2375,9 @@ Avec Fontconfig, cette option détermine le nom de police fontconfig. .br \-font ~/\:.mplayer/\:arialuni.ttf .br -\-font 'Bitstream Vera Sans' +\-font 'Bitstream Vera Sans:style' +.br +\-font 'Bitstream Vera Sans:style=Bold' .RE .PD 1 . @@ -2615,8 +2622,8 @@ Inutile actuellement. Identique à \-audiofile, mais pour les flux de sous-titres (OggDS ?). . .TP -.B \-subfont <filename> (FreeType uniquement) -Spécifie la police des sous-titres. +.B \-subfont <chemin vers la police (FreeType), motif de police (Fontconfig)> (FreeType uniquement) +Spécifie la police des sous-titres (voir \-font). Si \-subfont n'est pas spécifié, \-font est utilisé. . .TP @@ -3640,6 +3647,9 @@ réduction de bruit) .IPs deint=<0\-4> Sélectionne un désentrelaceur (par défaut\ : 0) Tous les modes > 0 respectent \-field\-dominance. +.br +.I NOTE\ : +Les valeurs > 2 retardent la sortie vidéo d'une image. .RSss .IPs 0 pas de désentrelacement @@ -3768,6 +3778,24 @@ Essayez cette option si vous avez des problèmes d'affichage. .PD 1 . .TP +.B kva (OS/2 uniquement) +Pilote de sortie vidéo utilisant l'interface libkva. +.PD 0 +.RSs +.IPs snap +Force le mode SNAP. +.IPs wo +Force le mode WarpOverlay!. +.IPs dive +Force le mode DIVE. +.IPs (no)t23 +Active le contournement pour les bugs de l'ordinateur portable T23. +Essayez d'activer cette option si votre carte vidéo ne gère que +l'agrandissement d'image (upscaling). +.RE +.PD 1 +. +.TP .B quartz (Mac OS X uniquement) Pilote de sortie vidéo Quartz pour Mac OS X. Dans certains cas, il est préférable de forcer le format de sortie packed YUV, diff --git a/DOCS/man/hu/mplayer.1 b/DOCS/man/hu/mplayer.1 index f0185ad174..415a7141b3 100644 --- a/DOCS/man/hu/mplayer.1 +++ b/DOCS/man/hu/mplayer.1 @@ -1,4 +1,4 @@ -.\" Synced with r28807 +.\" Synced with r28895 .\" MPlayer (C) 2000-2009 MPlayer Team .\" Ezt a man oldalt Gabucino, Diego Biurrun és Jonas Jermann készíti/készítette .\" Karbantartó: Gabrov @@ -33,7 +33,7 @@ .\" Név .\" -------------------------------------------------------------------------- . -.TH MPlayer 1 "2009. 03. 05." "MPlayer P |