diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-03-14 23:52:45 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-03-14 23:52:45 +0200 |
commit | ae2faad6669c313b7a5dd318baeee0bffdd47031 (patch) | |
tree | 0b383b5dde56d54be4b144e7e23e96bd8bdd43cf /DOCS | |
parent | b93f4b7bba0e31d157b74685d3166f74a6c244d7 (diff) | |
parent | 642162c07460e439d1d81cda4643dc028ed238e0 (diff) | |
download | mpv-ae2faad6669c313b7a5dd318baeee0bffdd47031.tar.bz2 mpv-ae2faad6669c313b7a5dd318baeee0bffdd47031.tar.xz |
Merge svn changes up to r28951
Diffstat (limited to 'DOCS')
-rw-r--r-- | DOCS/man/en/mplayer.1 | 34 | ||||
-rw-r--r-- | DOCS/man/fr/mplayer.1 | 40 | ||||
-rw-r--r-- | DOCS/man/hu/mplayer.1 | 20 | ||||
-rw-r--r-- | DOCS/man/ru/mplayer.1 | 21 | ||||
-rw-r--r-- | DOCS/tech/MAINTAINERS | 1 | ||||
-rw-r--r-- | DOCS/tech/codecs-in.html | 48 | ||||
-rw-r--r-- | DOCS/tech/mingw-crosscompile.txt | 32 | ||||
-rw-r--r-- | DOCS/tech/slave.txt | 2 | ||||
-rw-r--r-- | DOCS/tech/win32-codec-howto.txt | 43 | ||||
-rw-r--r-- | DOCS/xml/html-common.xsl | 4 |
10 files changed, 186 insertions, 59 deletions
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 Project" "A film lejátszó" +.TH MPlayer 1 "2009. 03. 09." "MPlayer Project" "A film lejátszó" . .SH NÉV mplayer \- film lejátszó @@ -958,6 +958,8 @@ Az Apple IR távirányítóhoz használt eszköz (alapértelmezetten automatikus detekt Egy gomb automatikus ismétlése elõtti késleltetés miliszekundumban (0: kikapcsolás). .IPs ar-rate Billentyû/másodperc érték megadása autorepeat használata esetén. +.IPs (no)default-binds +Az alapértelmezetten MPlayerbe épített billentyû-hozzárendeléseket használja. .IPs keylist Az összes használható billentyû listájának kiírása. .IPs cmdlist @@ -1134,6 +1136,8 @@ parancsokat olvas az stdin-rõl. .I MEGJEGYZÉS: A \-input cmdlist kapcsoló kilistázza a szolga módban használható parancsokat, a DOCS/tech/slave.txt fájlban megtalálod a leírásukat. +Ez nem a többi, pl. a videó ablakon keresztül érkezõ input letiltására készült, +arra használj mást, mint a \-input nodefault\-binds:conf=/dev/null. . .TP .B \-softsleep @@ -2258,14 +2262,14 @@ Akkor használd, ha a feliratban lévõ vesszõk a mondat elején látszódnak és nem a végén. . .TP -.B \-font <útvonal a font.desc fájlhoz> +.B \-font <útvonal a font.desc fájlhoz, útvonal a betûtípushoz (FreeType), betûtípus minta (Fontconfig)> Az OSD/\:SUB betûtipusok megadott könyvtárban történõ keresése (normál fontoknál alapértelmezett: ~/\:.mplayer/\:font/\:font.desc, FreeType fontokhoz: ~/.mplayer/\:subfont.ttf). .br .I MEGJEGYZÉS: FreeType-pal ez az opció a szöveges betûtípus fájlok elérési útját határozza meg. -A fontconfig-gal ez az opció a fontconfig betûtípus nevét határozza meg. +A fontconfig-gal ez az opció a Fontconfig betûtípus mintáját határozza meg. .sp 1 .I PÉLDA: .PD 0 @@ -2275,6 +2279,8 @@ A fontconfig-gal ez az opció a fontconfig betûtípus nevét határozza meg. \-font ~/\:.mplayer/\:arialuni.ttf .br \-font 'Bitstream Vera Sans' +.br +\-font 'Bitstream Vera Sans:style=Bold' .RE .PD 1 . @@ -2514,9 +2520,9 @@ Jelenleg haszontalan. Ugyan az, mint az \-audiofile, de felirat folyamokra (OggDS?). . .TP -.B \-subfont <fájlnév> (csak FreeType) -Beállítja a felirat betûtípusát. -Ha nincs megafva a \-subfont, a \-font lesz használva. +.B \-subfont <útvonal a betûtípushoz (FreeType), betûtípus minta (Fontconfig)> (csak FreeType) +Beállítja a felirat betûtípusát (lásd \-font). +Ha nincs megadva a \-subfont, a \-font lesz használva. . .TP .B \-subfont\-autoscale <0\-3> (csak FreeType) diff --git a/DOCS/man/ru/mplayer.1 b/DOCS/man/ru/mplayer.1 index bc062259b8..a47e8a5eac 100644 --- a/DOCS/man/ru/mplayer.1 +++ b/DOCS/man/ru/mplayer.1 @@ -2,7 +2,7 @@ .\" This man page was/is done by Gabucino, Diego Biurrun, Jonas Jermann .\" Translated by Vladimir Voroshilov <voroshil@gmail.com> .\" Encoding: koi8-r -.\" synced with r28807 +.\" synced with r28895 . .\" -------------------------------------------------------------------------- .\" ïÐÒÅÄÅÌÅÎÉÑ ÍÁËÒÏÓÏ× @@ -922,6 +922,8 @@ mplayer \-heartbeat\-cmd "gnome\-screensaver\-command \-p" file úÁÄÅÒÖËÁ × ÍÉÌÌÉÓÅËÕÎÄÁÈ ÐÅÒÅÄ ÎÁÞÁÌÏÍ Á×ÔÏÐÏ×ÔÏÒÁ (0 ÄÌÑ ÏÔËÌÀÞÅÎÉÑ). .IPs ar\-rate ëÏÌÉÞÅÓÔ×Ï ËÌÁ×ÉÛ × ÓÅËÕÎÄÕ, ÇÅÎÅÒÉÒÕÅÍÙÈ ÐÒÉ Á×ÔÏÐÏ×ÔÏÒÅ. +.IPs (no)default-binds +éÓÐÏÌØÚÏ×ÁÔØ ÐÒÉ×ÑÚËÉ ËÌÁ×ÉÛ, ÐÏÓÔÁ×ÌÑÅÍÙÅ Ó MPlayer ÐÏ ÕÍÏÌÞÁÎÉÀ. .IPs keylist ÷Ù×ÏÄÉÔ ×ÓÅ ËÌÁ×ÉÛÉ, ËÏÔÏÒÙÅ ÍÏÖÎÏ ÎÁÚÎÁÞÉÔØ ËÏÍÁÎÄÁÍ. .IPs cmdlist @@ -1085,17 +1087,18 @@ FIXME: üÔÏ ÔÒÅÂÕÅÔ ÔÝÁÔÅÌØÎÏÇÏ ÒÁÚßÑÓÎÅÎÉÑ É ÏÐÉÓÁÎÉÑ. . .TP .B \-slave (ÓÍÏÔÒÉÔÅ ÔÁËÖÅ \-input) -÷ËÌÀÞÁÅÔ "ÒÁÂÓËÉÊ" ÒÅÖÉÍ, × ËÏÔÏÒÏÍ MPlayer ÒÁÂÏÔÁÅÔ × ËÁÞÅÓÔ×Å ÂÜËÜÎÄÁ Ë ÄÒÕÇÉÍ ÐÒÏÇÒÁÍÍÁÍ. +÷ËÌÀÞÁÅÔ ×ÅÄÏÍÙÊ ÒÅÖÉÍ, × ËÏÔÏÒÏÍ MPlayer ÒÁÂÏÔÁÅÔ × ËÁÞÅÓÔ×Å ÂÜËÜÎÄÁ Ë ÄÒÕÇÉÍ ÐÒÏÇÒÁÍÍÁÍ. ÷ÍÅÓÔÏ ÐÅÒÅÈ×ÁÔÁ ÓÏÂÙÔÉÊ ËÌÁ×ÉÁÔÕÒÙ, MPlayer ÂÕÄÅÔ ÞÉÔÁÔØ ÓÏ ÓÔÁÎÄÁÒÔÎÏÇÏ ×ÈÏÄÁ ËÏÍÁÎÄÙ, ÒÁÚÄÅÌÅÎÎÙÅ ÓÉÍ×ÏÌÏÍ ÎÏ×ÏÊ ÓÔÒÏËÉ (\\n). .br .I úáíåþáîéå: óÍÏÔÒÉÔÅ ÓÐÉÓÏË ÜÔÉÈ ËÏÍÁÎÄ × \-input cmdlist É ÏÐÉÓÁÎÉÑ × DOCS/tech/slave.txt. +üÔÁ ÏÐÃÉÑ ÎÅ ÐÒÅÄÎÁÚÎÁÞÅÎÁ ÄÌÑ ÏÔËÌÀÞÅÎÉÑ ÄÒÕÇÉÈ ÉÓÔÏÞÎÉËÏ× ××ÏÄÁ, +ÎÁÐÒÉÍÅÒ ÐÒÉ ÐÏÍÏÝÉ ÏËÎÁ ×ÉÄÅÏ; ÄÌÑ ÄÁÎÎÙÈ ÃÅÌÅÊ ÉÓÐÏÌØÚÕÊÔÅ ÉÎÙÅ +ÓÐÏÓÏÂÙ, ÎÁÐÒÉÍÅÒ, \-input nodefault\-binds:conf=/dev/null. . .TP .B \-softsleep -.\" FIXME is translation correct? -.\" Time frames by repeatedly checking the current time instead of asking the õÓÔÁÎÁ×ÌÉ×ÁÅÔ ÔÁÊÍÉÎÇ ËÁÄÒÏ×, ÐÏÓÔÏÑÎÎÏ ÐÒÏ×ÅÒÑÑ ÔÅËÕÝÅÅ ×ÒÅÍÑ, ×ÍÅÓÔÏ ÐÒÏÓØÂÙ ÑÄÒÕ ÐÒÏÂÕÖÄÁÔØ MPlayer × ÎÕÖÎÙÊ ÍÏÍÅÎÔ. ðÏÌÅÚÎÏ, ÅÓÌÉ ÔÁÊÍÅÒ ×ÁÛÅÇÏ ÑÄÒÁ ÎÅÔÏÞÅÎ É ×Ù ÎÅ ÍÏÖÅÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ RTC. @@ -2217,14 +2220,14 @@ SubViewer (SRT). ×ÍÅÓÔÏ ÉÈ ËÏÎÃÁ. . .TP -.B \-font <ÐÕÔØ Ë ÆÁÊÌÕ font.desc> +.B \-font <ÐÕÔØ Ë ÆÁÊÌÕ font.desc, ÐÕÔØ Ë ÛÒÉÆÔÕ (FreeType), ÎÁÚ×ÁÎÉÅ ÛÒÉÆÔÁ (Fontconfig))> éÝÅÔ OSD/\:SUB ÛÒÉÆÔÙ × ÄÒÕÇÏÍ ËÁÔÁÌÏÇÅ (ÐÏ ÕÍÏÌÞÁÎÉÀ ÄÌÑ ÏÂÙÞÎÙÈ ÛÒÉÆÔÏ×: ~/\:.mplayer/\:font/\:font.desc, ÐÏ ÕÍÏÌÞÁÎÉÀ ÄÌÑ FreeType ÛÒÉÆÔÏ×: ~/.mplayer/\:subfont.ttf). .br .I úáíåþáîéå: ó FreeType, ÜÔÁ ÏÐÃÉÑ ÏÐÒÅÄÅÌÑÅÔ ÐÕÔØ Ë ÆÁÊÌÕ ÛÒÉÆÔÁ ÔÅËÓÔÁ. -ó fontconfig, ÜÔÁ ÏÐÃÉÑ ÏÐÒÅÄÅÌÑÅÔ ÎÁÚ×ÁÎÉÅ ÛÒÉÆÔÁ fontconfig. +ó Fontconfig, ÜÔÁ ÏÐÃÉÑ ÏÐÒÅÄÅÌÑÅÔ ÎÁÚ×ÁÎÉÅ ÛÒÉÆÔÁ fontconfig. .sp 1 .I ðòéíåò: .PD 0 @@ -2234,6 +2237,8 @@ SubViewer (SRT). \-font ~/\:.mplayer/\:arialuni.ttf .br \-font 'Bitstream Vera Sans' +.br +\-font 'Bitstream Vera Sans:style=Bold' .RE .PD 1 . @@ -2475,8 +2480,8 @@ cp1250, ÅÓÌÉ ÏÐÒÅÄÅÌÅÎÉÅ ÎÅ ÒÁÂÏÔÁÅÔ. ôÏ ÖÅ, ÞÔÏ É \-audiofile, ÎÏ ÄÌÑ ÐÏÔÏËÁ ÓÕÂÔÉÔÒÏ× (OggDS?). . .TP -.B \-subfont <ÉÍÑ ÆÁÊÌÁ> (ÔÏÌØËÏ FreeType) -õÓÔÁÎÁ×ÌÉ×ÁÅÔ ÛÒÉÆÔ ÓÕÂÔÉÔÒÏ×. +.B \-subfont <ÉÍÑ ÆÁÊÌÁ (FreeType), ÎÁÚ×ÁÎÉÅ ÛÒÉÆÔÁ (Fontconfig)> (ÔÏÌØËÏ FreeType) +õÓÔÁÎÁ×ÌÉ×ÁÅÔ ÛÒÉÆÔ ÓÕÂÔÉÔÒÏ× (ÓÍ. \-font). åÓÌÉ ÏÐÃÉÑ \-subfont ÎÅ ÕËÁÚÁÎÁ, ÉÓÐÏÌØÚÕÅÔÓÑ \-font. . .TP diff --git a/DOCS/tech/MAINTAINERS b/DOCS/tech/MAINTAINERS index 087d566212..68b0768bc4 100644 --- a/DOCS/tech/MAINTAINERS +++ b/DOCS/tech/MAINTAINERS @@ -116,7 +116,6 @@ demuxers: * demux_rtp* - Ross Finlayson * demux_mpg and demux_ts - Nico Sabbi * demux_mpc.c - Reimar Döffinger - * demux_nuv.c - Reimar Döffinger muxers: * muxer_lavf.c - Michael Niedermayer diff --git a/DOCS/tech/codecs-in.html b/DOCS/tech/codecs-in.html index c4b29aa99c..488512d286 100644 --- a/DOCS/tech/codecs-in.html +++ b/DOCS/tech/codecs-in.html @@ -6,19 +6,15 @@ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> </head> <body text="#000000" link="#666666" vlink="#666666" alink="#666666"> -<table width=750 border="0"> - <tr> - <td align="right"> - <p> </p> - <p><b>Status of codecs support</b></p> - </td> - </tr> - <tr> - <td> - <p><a href="#vc">Video codecs</a><br><a href="#ac">Audio codecs</a><br></p> - </td> - </tr> +<h1>Status of codecs support</h1> + +<ul> + <li><a href="#vc">Video codecs</a></li> + <li><a href="#ac">Audio codecs</a></li> +</ul> + +<table width=750 border="0"> <tr> <td align="center"> <b><font face="Verdana, Arial, Helvetica, sans-serif" size="5"><a name="vc">Video codecs:</a></font></b><br><br> @@ -31,7 +27,7 @@ <tr> <td width=150 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">codec name</font></b></td> <td width=70 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">fourcc</font></b></td> - <td width=120 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">codecfile</font></b></td> + <td width=120 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">driver name</font></b></td> <td width=40 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">out</font></b></td> <td align=center colspan=2><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">comments</font></b></td> </tr> @@ -51,8 +47,8 @@ <tr> <td width=150 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">codec name</font></b></td> <td width=70 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">fourcc</font></b></td> - <td width=120 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">codecfile</font></b></td> - <td colspan=3 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">problem</font></b></td> + <td width=120 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">driver name</font></b></td> + <td colspan=3 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">comments</font></b></td> </tr> <!-- %4 --> <tr> @@ -69,8 +65,8 @@ <tr> <td width=150 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">codec name</font></b></td> <td width=70 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">fourcc</font></b></td> - <td width=120 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">codecfile</font></b></td> - <td colspan=3 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">problem</font></b></td> + <td width=120 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">driver name</font></b></td> + <td colspan=3 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">comments</font></b></td> </tr> <!-- %2 --> <tr> @@ -87,8 +83,8 @@ <tr> <td width=150 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">codec name</font></b></td> <td width=70 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">fourcc</font></b></td> - <td width=120 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">codecfile</font></b></td> - <td colspan=3 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">problem</font></b></td> + <td width=120 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">driver name</font></b></td> + <td colspan=3 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">comments</font></b></td> </tr> <!-- %3 --> <tr> @@ -111,7 +107,7 @@ <tr> <td width=150 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">codec name</font></b></td> <td width=70 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">format</font></b></td> - <td width=120 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">codecfile</font></b></td> + <td width=120 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">driver name</font></b></td> <td align=center colspan=3><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">comments</font></b></td> </tr> <!-- %5 --> @@ -129,8 +125,8 @@ <tr> <td width=150 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">codec name</font></b></td> <td width=70 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">format</font></b></td> - <td width=120 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">codecfile</font></b></td> - <td colspan=3 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">problem</font></b></td> + <td width=120 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">driver name</font></b></td> + <td colspan=3 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">comments</font></b></td> </tr> <!-- %9 --> <tr> @@ -147,8 +143,8 @@ <tr> <td width=150 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">codec name</font></b></td> <td width=70 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">format</font></b></td> - <td width=120 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">codecfile</font></b></td> - <td colspan=3 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">problem</font></b></td> + <td width=120 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">driver name</font></b></td> + <td colspan=3 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">comments</font></b></td> </tr> <!-- %7 --> <tr> @@ -165,8 +161,8 @@ <tr> <td width=150 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">codec name</font></b></td> <td width=70 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">format</font></b></td> - <td width=120 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">codecfile</font></b></td> - <td colspan=3 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">problem</font></b></td> + <td width=120 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">driver name</font></b></td> + <td colspan=3 align=center><b><font color="#AAAAAA" face="Verdana, Arial, Helvetica, sans-serif" size="2">comments</font></b></td> </tr> <!-- %8 --> <tr> diff --git a/DOCS/tech/mingw-crosscompile.txt b/DOCS/tech/mingw-crosscompile.txt new file mode 100644 index 0000000000..e4e2dbee0e --- /dev/null +++ b/DOCS/tech/mingw-crosscompile.txt @@ -0,0 +1,32 @@ +Due to a lack of Windows developers, it is a good idea to allow Linux +developers to do at least some basic check of their code. +This HOWTO explains how to set up MinGW cross-compilation under Debian. + +First, you need to install the "mingw32" package and get a MPlayer SVN +checkout. + +Next, you need quite a lot of dependencies. Since this is for testing and +not actually use, the easiest way is to use this package: +http://natsuki.mplayerhq.hu/~reimar/mpl_mingw32.tar.bz2 +NOTE that this is likely to be quite out-dated and might include packages +with security issues, so do not use it to build binaries for real use. + +After extracting this package into the MPlayer source-tree, +you only need to run the included linux-mingw.sh to configure (it just runs +./configure --host-cc=cc --target=i686-mingw32msvc --cc=i586-mingw32msvc-cc +--windres=i586-mingw32msvc-windres --ranlib=i586-mingw32msvc-ranlib +--with-extraincdir="$PWD/osdep/mingw32" +--with-extralibdir="$PWD/osdep/mingw32" +--with-freetype-config="$PWD/osdep/mingw32/ftconf") and then run make. + +You should be able to run the generated binary with Wine, if you want to. + +The steps as command-lines: + +sudo apt-get install mingw32 +svn co svn://svn.mplayerhq.hu/mplayer/trunk MPlayer-mingw +cd MPlayer-mingw +wget http://natsuki.mplayerhq.hu/~reimar/mpl_mingw32.tar.bz2 +tar -xjf mpl_mingw32.tar.bz2 +sh linux-mingw.sh +make diff --git a/DOCS/tech/slave.txt b/DOCS/tech/slave.txt index 2ad276defd..df23826c3c 100644 --- a/DOCS/tech/slave.txt +++ b/DOCS/tech/slave.txt @@ -30,6 +30,8 @@ As a temporary hack, there is also the _experimental_ "pausing_keep_force " prefix, with which MPlayer will not exit the pause loop at all. Like this you can avoid the "frame stepping" effect of "pausing_keep " but most commands will either not work at all or behave in unexpected ways. +For "set_mouse_pos" and "key_down_event", "pausing_keep_force" is the default +since other values do not make much sense for them. Available commands ('mplayer -input cmdlist' will print a list): diff --git a/DOCS/tech/win32-codec-howto.txt b/DOCS/tech/win32-codec-howto.txt index 81dfafca83..3346de47bb 100644 --- a/DOCS/tech/win32-codec-howto.txt +++ b/DOCS/tech/win32-codec-howto.txt @@ -25,17 +25,36 @@ Cannot find codec matching selected -vo and video format 0x55594648. It means your AVI is encoded with a codec which has the HFYU fourcc (HFYU = HuffYUV codec, DIV3 = DivX Low Motion, etc.). Now that you know this, you -have to find out which DLL Windows loads in order to play this file. In our -case, the 'system.ini' contains this information in a line that reads: +have to find out which DLL Windows loads in order to play this file. +You can find the vfw codec by searching the internet for e.g. VIDC.HFYU. + +In our case, the 'system.ini' also contains this information in a line that reads: VIDC.HFYU=huffyuv.dll -So you need the 'huffyuv.dll' file. Note that the audio codecs are -specified by the MSACM prefix: +So you need the 'huffyuv.dll' file. + + + +ACM Codecs: +~~~~~~~~~~~~ +MPlayer may fail at playing the audio in your file with this message: + +Cannot find codec for audio format 0x55. +Read DOCS/HTML/en/codecs.html! +Audio: no sound + +MPlayer calls this the TwoCC format identifier. From the TwoCC list we find: + +0x0055 MPEG-1 Layer 3 (MP3) + +If you are lucky, you can then just search the internet for "codec acm" +e.g. "mp3 acm". Or if the codec is already installed on Windows, +it will show up in the system.ini as: msacm.l3acm=L3codeca.acm -This is the MP3 codec. +Note that the audio codecs are specified by the MSACM prefix: @@ -53,7 +72,7 @@ New Method: Using Microsoft GraphEdit (fast) -- Get GraphEdit from either DirectX SDK or doom9. +- Get GraphEdit from the Microsoft SDK, DirectX SDK or doom9. - Start 'graphedit.exe'. - From the menu select "Graph -> Insert Filters". - Expand item "DirectShow Filters". @@ -86,3 +105,15 @@ Take a deep breath and start searching the registry... If searching fails, try enabling all the checkboxes. You may have false hits, but you may get lucky... + + + +Tips: +~~~~~~~ +If you get an error loading a new codec, it may need some more files to work. +Start the filemon utility before loading MPlayer to find out which dlls are +trying to be loaded. + +Your codec may load some external .dll libraries. If the codec is already +installed in Windows, run listdlls wmplayer.exe while Windows Media +Player is playing your file to find out which. diff --git a/DOCS/xml/html-common.xsl b/DOCS/xml/html-common.xsl index dc3cb14cea..d803b3d1d4 100644 --- a/DOCS/xml/html-common.xsl +++ b/DOCS/xml/html-common.xsl @@ -2,7 +2,9 @@ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> -<xsl:output method="html" indent="no"/> +<xsl:output method="html" indent="no" + doctype-system="http://www.w3.org/TR/html4/loose.dtd" + doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"/> <!-- ************** Set parameters |