changeset 3879:ed33540a982b

"updated documentation.html (and new chapter translated in it), codecs.html and new whole translated file: DVB. The rest of the files are newest english versions. I think that it's better to have them updated than wait for my translations..."
author gabucino
date Sat, 29 Dec 2001 18:46:10 +0000
parents 1db1b532cdd2
children a176f90762fa
files DOCS/Polish/DVB DOCS/Polish/DXR3 DOCS/Polish/cd-dvd.html DOCS/Polish/codecs.html DOCS/Polish/documentation.html DOCS/Polish/encoding.html DOCS/Polish/faq.html DOCS/Polish/formats.html DOCS/Polish/gcc-2.96-3.0.html DOCS/Polish/mencoder.1 DOCS/Polish/mplayer.1 DOCS/Polish/sound.html DOCS/Polish/video.html
diffstat 13 files changed, 760 insertions(+), 379 deletions(-) [+]
line wrap: on
line diff
--- a/DOCS/Polish/DVB	Sat Dec 29 16:43:24 2001 +0000
+++ b/DOCS/Polish/DVB	Sat Dec 29 18:46:10 2001 +0000
@@ -1,72 +1,77 @@
 
-Some words about Siemens-DVB card support.         by A'rpi
-==========================================
+Kilka słów o obsłudze karty Siemens-DVB.         autor: A'rpi
+========================================
 
-NOTE: this is very experimental!
+UWAGA: ona jest na etapie eksperymentalnym!
 
-Requirements:
-~~~~~~~~~~~~~
-- Siemens DVB-S card or compatible (technotrend,galaxis,hauppage etc)
-  see www.linuxtv.org for details and download latest driver there.
-- MPlayer-CVS, ffmpeg-libavcodec. divx4linux is recommended for speed & pp.
-- Fast CPU - at least for software decoding (divx...)
+Wymagania:
+~~~~~~~~~~
+- karta Siemens DVB-S albo kompatybilna (technotrend, galaxis, hauppage itp.)
+  zobacz szczegóły na www.linuxtv.org i ściągnij najnowszy sterownik.
+- MPlayer-CVS, ffmpeg-libavcodec. divx4linux jest polecany ze względu na
+  prędkość i pp.
+- Szybki CPU - przynajmniej do dekodowania programowego (divx...)
 
 
-How to enable?
-~~~~~~~~~~~~~~
+Jak włączyć?
+~~~~~~~~~~~~
 
-1. Download ffmpeg-CVS and copy libavcodec to mplayer (see DOC for details)
-   Move this line from #ifdef CONFIG_ENCODERS .. #endif section to outside
-   (after the #endif line) at libavcodec/utils.c:361 :
+1. Ściągnij ffmpeg-CVS i przekopiuj libavcodec do źródeł mplayera (szczegóły
+znajdziesz w  DOC)
+   Przenieś tą linię z sekcji #ifdef CONFIG_ENCODERS .. #endif poza nią 
+   (po linii #endif) w libavcodec/utils.c:361 :
        register_avcodec(&mpeg1video_encoder);
 
-2. Compile mplayer:
-    ./configure should detect it. If didn't, force with ./configure --enable-dvb
-        If you have ost headers at non-standard path, set it with:
-	--with-extraincdir=<your DVB source dir>/ost/include
+2. Skompiluj mplayer:
+    ./configure powinno wykryć to. Jeżeli nie, wymuś to za pomocą opcji
+    ./configure --enable-dvb
+    Jeśli masz nagłówki ost w niestandardowym miejscu, podaj ścieżkę do nich:
+	--with-extraincdir=<twój katalog ze źródłami DVB>/ost/include
     make
     make install
    
 
-How to use?
+Jak używać?
 ~~~~~~~~~~~
-To play standard mpeg 1/2 files:  (hardware decoding)
+Aby odtwarzać standardowe pliki mpeg 1/2:  (sprzętowe dekodowanie)
 
   mplayer -ao mpegpes -vo mpegpes -vc mpegpes file.mpg|vob
 
-To play non-standard mpeg files:  (software decoding)
+Aby odtwarzać niestandardowe pliki mpeg:  (dekodowanie programowe)
 
   mplayer -ao mpegpes -vo mpegpes file.mpg|vob
 
-To play divx files:
+Aby odtwarzać pliki divx:
 
   mplayer -vo mpegpes -vc ffdivx|odivx file.avi|asf
   
-To play non-25fps movies, or with slow CPU, add option:  -framedrop
+Aby odtwarzać filmy nie-25fps lub przy wolnym CPU, dodaj opcję:  -framedrop
 
-Image size:
-~~~~~~~~~~~
-DVB card allows only 2 vertical resolutions: 288 and 576.
-If your video height differs, you have to clip it or extend by adding
-black bands. It's done by mplayer, just specify image size using the
--x and -y options. You must use either -y 288 or -y 576.
+Rozmiary obrazka:
+~~~~~~~~~~~~~~~~~
+Karta DVB pozwala tylko na dwie pionowe rozdzielczości: 288 i 576. Jeżeli
+wysokość twojego video jest inna, musisz ją obciąć albo rozszerzyć dodając
+czarne paski. Zrobi to dla ciebie mplayer, tylko podaj rozmiary obrau używając
+opcji -x oraz -y. Musisz zastosować -y 288 albo -y 576.
 
-To force pan&scan (16:9 at 4:3 TV), add options:  -x 352 -y 288
+Aby wymusić pan&scan (16:9 na 4:3 TV) dodaj opcje:  -x 352 -y 288
 
-Mailing list:
-~~~~~~~~~~~~~
+Lista mailowa:
+~~~~~~~~~~~~~~
   http://mplayerhq.hu/mailman/listinfo/mplayer-dvb
 
-List's language is ENGLISH. Please avoid using german or other languages!
-Subscribe, and ask/discuss your problems here.
-I'll also post feature announces to this list.
+Językiem listy jest ANGIELSKI. Unikaj, proszę, używania niemieckiego lub innych
+języków!
+Zasubskrybuj i pytaj/dyskutuj tu o swoich problemach.
+Ja również wysyłam zapowiedzi na tą listę.
 
-Future plans/TODO:
-~~~~~~~~~~~~~~~~~~
+Plany/TODO na przyszłość:
+~~~~~~~~~~~~~~~~~~~~~~~~~
 
-- display OSD and subtitles using DVB card's OSD feature
-- better (more fluent) playback of non-25fps movies
-- more speed optimizations
-- YUY2 support (for win32 codecs, like Indeo5 and WMV 7/8)
-- realtime transcoding between mpeg2 <-> mpeg4 (partial decompression)
+- wyświetlanie OSD i napisów za pomocą właściwości OSD kart DVB
+- lepsze (bardziej płynne) odgrywanie filmów nie-25fps
+- większa optymalizacja prędkości
+- obsługa YUY2 (dla kodeków win32, takich, jak Indeo5 i WMV 7/8)
+- transkodowanie w czasie rzeczywistym pomiędzy mpeg2 <-> mpeg4 (częściowa
+  dekompresja)
 
--- a/DOCS/Polish/DXR3	Sat Dec 29 16:43:24 2001 +0000
+++ b/DOCS/Polish/DXR3	Sat Dec 29 18:46:10 2001 +0000
@@ -1,6 +1,20 @@
 DXR3/H+ video/audio output plugins manual by David Holm
 =======================================================
 
+2001-12-28: There is a whole bunch of updates since the
+            last time. For one thing, digital audio now
+	    works thanks to Steven Brookes.
+	    This is the first version to exclusively
+	    use the dxr3's hardware sync. It seems as if
+	    there are some bugs in the driver, so bugreports
+	    will be appreciated.
+	    Also, you will need to get the em8300 drivers
+	    from cvs unless a version newer than 0.9.0 has
+	    been released.
+	    Note1: Seeking won't work with -vc mpegpes!
+	    Note2: You now MUST use -ao dxr3 for proper
+	    a/v sync!
+	    
 2001-12-04: Thanks to Inaki Garci'a Etxebarria of
 	    zapping.sourceforge.net we have now
 	    abandoned rte since it caused problems for
@@ -12,12 +26,6 @@
 	    optimize the odivx playback as well as add
 	    support for the rest of the codecs!
 	    
-2001-11-28: ffmpeg replaced with mp1e, divx playback
-	    won't get much faster than this, huge thanks
-	    goes out to Ivan Kalvachev for helping me
-	    fix the final mp1e bugs (and contributing
-	    to the libvo2 development)
-	    
 1. Introduction
 
 The DXR3 and Hollywood+ are two not too different mpeg-(1/2) and ac3
@@ -77,10 +85,14 @@
 Remember that if you edit the codecs.conf file and move the mpegpes
 section will have to specify "-vc mpeg12" if you want to playback
 any of these video types _without_ "-vo dxr3"!
+Use -ac hwac3 if you want AC3 audio to be handled by hardware (please
+send some feedback on this).
 
 DIVX Notes
 When playing divx's add "-vc odivx" for maximum performance.
 I've switched to mp1e from ffmpeg so it should be lightning fast now.
+libmp1e currently does not work on nonx86 processor and nonmmx processors.
+I'm in the process of fixing this.
 
 Other codecs:
 No "-vc <codec>" switches should be required as mplayer will autodetect.
--- a/DOCS/Polish/cd-dvd.html	Sat Dec 29 16:43:24 2001 +0000
+++ b/DOCS/Polish/cd-dvd.html	Sat Dec 29 18:46:10 2001 +0000
@@ -127,10 +127,28 @@
 <TD><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>Selects DVD chapter (default: play from chapter 1)</TD><TR>
 <TD VALIGN=top><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>-dvdangle &lt;angle_id&gt;&nbsp;</TD>
 <TD><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>Selects camera angle (default: 1)</TD><TR>
+<TD VALIGN=top><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>-alang &lt;country code&gt;&nbsp;</TD>
+<TD><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>
+  The <CODE>country code</CODE> tells <B>MPlayer</B> which audio language(s) to prefer.
+  For the list of available languages, add <CODE>-v</CODE> option after
+  your DVD options, and browse the output.<BR>
+  For example :<BR>
+  &nbsp;&nbsp;<CODE>-alang hu,en</CODE> - first tries to find hungarian
+  audio, and if not found, decode english audio.</TD></TR>
+<TD VALIGN=top><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>-slang &lt;country code&gt;&nbsp;</TD>
+<TD><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>
+  Turns on DVD subtitles. The <CODE>country code</CODE> tells <B>MPlayer</B>
+  which language(s) to prefer.
+  For the list of available languages, add <CODE>-v</CODE> option after
+  your DVD options, and browse the output.<BR>
+  For example :<BR>
+  &nbsp;&nbsp;<CODE>-slang hu,en</CODE> - first tries to display hungarian
+  subtitles, and if not found, display english subtitles.</TD></TR>
 <TD VALIGN=top><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>-sid &lt;subtitle_id&gt;&nbsp;</TD>
-<TD><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>Turns DVD subtitle displaying (of the given subtitle_id or language) on (default: no)<BR>
-  For the list of available languages, use <CODE>-sid 1 -v</CODE> options and
-  browse the output.</TD><TR>
+<TD><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>
+  Displays a subtitle channel with the given <CODE>id</CODE> (values can be
+  0-31). Useful for example with badly mastered DVDs where country code
+  selects the wrong channel.
 </TABLE>
 
 <P>Default device is <CODE>/dev/dvd</CODE>, you can change it in config.h
--- a/DOCS/Polish/codecs.html	Sat Dec 29 16:43:24 2001 +0000
+++ b/DOCS/Polish/codecs.html	Sat Dec 29 18:46:10 2001 +0000
@@ -24,6 +24,7 @@
 <LI>Kodeki XAnim</LI>
 <LI>VIVO</LI>
 <LI>FLI</LI>
+<LI>RealVideo 1.0</LI>
 </UL></P>
 
 <P>Jeśli masz kodeka Win32 nie wymienionego tutaj, oraz jeszcze nie
@@ -131,7 +132,7 @@
 <P>Następnie skompiluj. configure wykrywa czy wszystko jest w porządku i może
 być skompilowane. Ten kodek również <B>wspiera postprocessing!</B></P>
 
-<P>W celu użycia go, odśwież swój plik codecs.conf, zgodnie z tym, co mówią
+<P>W celu użycia go, uaktualnij swój plik codecs.conf, zgodnie z tym, co mówią
 strony podręcznika lub  example.conf (opcja -vfm).</P>
 
 <P>Aby osiągnąć <B>największą prędkość</B> na moim K6, usuwam sekcję
@@ -211,10 +212,16 @@
 
 <P><B><A NAME=2.2.1.7>2.2.1.7. Cinepak CVID</A></B></P>
 
-<P>Najlepszym sposobem, aby oglądać obrazy Cinepak za pomocą <B>MPlayera</B>
-jest użycie kodeka XAnim <CODE>vid_cvid.xa</CODE>, ponieważ obsługuje on wyjścia
-YV12, YUY2, w przeciwieństwie do kodeka Win32, który wspiera wyłącznie RGB.</P>
+<P><B>MPlayer</B> posiada teraz swój własny opensource, wieloplatformowy
+dekoder Cinepak. Obsługuje on wyjścia YUV, wykonuje skalowanie sprzętowe, jeśli
+sterowniki wyjścia video na to pozwalają. Jest używany domyślnie.</P>
 
+<P><B><A NAME=2.2.1.8>2.2.1.8.  RealVideo</A></B></P>
+
+<P> Aktualnie obsługiwany jest TYLKO kodek RealVideo 1.0 (fourcc RV10), poprzez
+ffmpeg. To smutne, ale żadne nowe pliki RealMedia nie są z nim dostarczone,
+tylko nowe kodeki RV20 i RV30, które są closed-source. Mało prawdopodbne jest
+wsparcie dla nich w przyszłości :(</P>
 
 <P><B><A NAME=2.2.2>2.2.2. Kodeki dźwięku</A></B></P>
 
@@ -227,6 +234,7 @@
 <LI>Voxware audio (użycie DirectShow DLL)</LI>
 <LI>alaw, msgsm, pcm i inne proste stare formaty dźwiękowe</LI>
 <LI>VIVO audio (g723, Vivo Siren)</LI>
+<LI>RealAudio: DNET (niska bitrate AC3)</LI>
 </UL></P>
 
 
@@ -288,6 +296,11 @@
 strony</A>, a następnie skopiować go do katalogu <CODE>/usr/lib/win32</CODE>
 lub innego odpowiedniego.</P>
 
+<P><B><A NAME=2.2.2.5>2.2.2.5.  RealAudio</A></B></P>
+
+<P>Aktualnie jedynym obsługiwanym kodekiem jest DNET. Właściwie jest to wersja
+low-bitrate dobrze znanego kodeka AC3. Może on się pojawić zarówno w starszych
+jak i w nowych filmach RealMedia</P>
 
 <P><B><A NAME=2.2.3>2.2.3. Importowanie kodeków Win32</A></B></P>
 
--- a/DOCS/Polish/documentation.html	Sat Dec 29 16:43:24 2001 +0000
+++ b/DOCS/Polish/documentation.html	Sat Dec 29 18:46:10 2001 +0000
@@ -39,6 +39,10 @@
         <LI><A HREF="formats.html#2.1.1.3">2.1.1.3 Pliki ASF/WMV</A></LI>
         <LI><A HREF="formats.html#2.1.1.4">2.1.1.4 Pliki QT/MOV</A></LI>
         <LI><A HREF="formats.html#2.1.1.5">2.1.1.5 Pliki VIV</A></LI>
+	<LI><A HREF="formats.html#2.1.1.6">2.1.1.6 Pliki FLI</A></LI>
+	<LI><A HREF="formats.html#2.1.1.7">2.1.1.7 Pliki RealMedia</A></LI>
+	<LI><A HREF="formats.html#2.1.1.8">2.1.1.8 Pliki NuppelVideo</A></LI>
+	<LI><A HREF="formats.html#2.1.1.9">2.1.1.9 Pliki yuv4mpeg</A></LI>
       </UL>
       <LI><A HREF="formats.html#2.1.2">2.1.2 Dźwięk</A></LI>
     </UL>
@@ -53,6 +57,7 @@
         <LI><A HREF="codecs.html#2.2.1.5">2.2.1.5 Obraz MPEG1/2</A></LI>
         <LI><A HREF="codecs.html#2.2.1.6">2.2.1.6 MS Video1</A></LI>
         <LI><A HREF="codecs.html#2.2.1.7">2.2.1.7 Cinepak CVID</A></LI>
+	<LI><A HREF="codecs.html#2.2.1.8">2.2.1.8 RealVideo</A></LI>
       </UL>
       <LI><A HREF="codecs.html#2.2.2">2.2.2 Dźwięk</A></LI>
       <UL>
@@ -60,6 +65,7 @@
 	<LI><A HREF="codecs.html#2.2.2.2">2.2.2.2 Dekodowanie sprzętowe AC3</A></LI>
 	<LI><A HREF="codecs.html#2.2.2.3">2.2.2.3 Wsparcie dla libmad</A></LI>
 	<LI><A HREF="codecs.html#2.2.2.4">2.2.2.4 Dźwięk VIVO</A></LI>
+	<LI><A HREF="codecs.html#2.2.2.5">2.2.2.5 RealAudio</A></LI>
       </UL>
       <LI><A HREF="codecs.html#2.2.3">2.2.3 Jak importować kodeki Win32</A></LI>
       <UL>
@@ -79,6 +85,7 @@
 	  <LI><A HREF="video.html#2.3.1.2.3">2.3.1.2.3 nVidia</A></LI>
 	  <LI><A HREF="video.html#2.3.1.2.4">2.3.1.2.4 ATI</A></LI>
 	  <LI><A HREF="video.html#2.3.1.2.5">2.3.1.2.5 NeoMagic</A></LI>
+	  <LI><A HREF="video.html#2.3.1.2.6">2.3.1.2.6 Trident cards</A></LI>
 	</UL>
 	<LI><A HREF="video.html#2.3.1.3">2.3.1.3 DGA</A></LI>
 	<UL>
@@ -115,6 +122,10 @@
       <LI><A HREF="sound.html#2.3.2">2.3.2 Dźwięk</A></LI>
       <UL>
 	<LI><A HREF="sound.html#2.3.2.1">2.3.2.1 Doświadczenia z kartami dźwiękowymi, rekomendacje</A></LI>
+	<LI><A HREF="sound.html#2.3.2.2">2.3.2.2 Wtyczki audio</A></LI>
+	  <UL>
+	    <LI><A HREF="sound.html#2.3.2.2.1">2.3.2.2.1 Up/Downsampling</A></LI>
+	  </UL>  
       </UL>
     </UL>
     <LI><A HREF="encoding.html#2.4">2.4 MEncoder - koder oparty na MPlayerze</A></LI>
@@ -128,6 +139,7 @@
             <LI><A HREF="encoding.html#2.4.3.2">2.4.3.2 Przeskalowywanie filmów</A></LI>
             <LI><A HREF="encoding.html#2.4.3.3">2.4.3.3 Streamcopy</A></LI>
 	    <LI><A HREF="encoding.html#2.4.3.4">2.4.3.4 Naprawa plików AVI z uszkodzonym indeksem</A></LI>
+	    <LI><A HREF="encoding.html#2.4.3.5">2.4.3.5 Kodowanie z użyciem rodzinu kodeków libavcodec</A></LI>
           </UL>
         <LI><A HREF="encoding.html#2.4.4">2.4.4 Składnia</A></LI>
         <LI><A HREF="encoding.html#2.4.5">2.4.5 Dostępne opcje</A></LI>
@@ -316,7 +328,9 @@
   <LI><B>make</B> - sugerowana wersja, to <B>wersja najnowsza</B> (nie starsza
 niż 3.79.x). Jest to zazwyczaj mało istotne.</LI>
   <LI><B>SDL</B> - nie jest to niezbędne, ale może pomóc w niektórych
-przypadkach. Zawsze używaj najnowszej wersji (począwszy od 1.2.x).</LI>
+przypadkach (zły dźwięk, karty graficzne, które mają dziwne opóźnienia podczas
+używania sterownika xv). Zawsze używaj najnowszej wersji (począwszy od
+1.2.x).</LI>
 </UL>
 
 <P><B><I>KODEKI</I></B></P>
@@ -372,56 +386,57 @@
 
 <P><B><I>KARTY GRAFICZNE</I></B></P>
 
-<P>There are generally two kind of videocards. One kind (the newer cards) has
-<B>hardware YUV acceleration</B> support, the other cards don't.</P>
+<P>Generelnie istnieją dwa rodzaje kart graficznych. Karty posiadające obsługę
+<B>sprzętowej akceleracji YUV</B> (nowsze) oraz pozostałe karty, nie posiadające
+tego.</P>
 
 <P>
 <B><I>KARTY YUV</I></B></P>
 
-<P>
-They can display and scale (zoom) the picture to any size that fits in
-their memory, with <B>small CPU usage</B> (zooming doesn't increase it!), thus
-you get a nice and very fast fullscreen playing.</P>
+<P> Potrafią one wyświetlać i skalować (zoom) obrazki do dowolnego rozmiaru,
+jaki mieści się w ich pamięci, z <B>małym zużyciem CPU</B> (zooming nie
+zwieksza go!), dzięki czemu masz bardzo szybkie pełnoekranowe odtwarzanie.</P>
 
 <P>
-<UL>
-<LI><B>Karty Matrox G200/G400/G450/G550</B> : please see the <A HREF="video.html#2.3.1.7">mga_vid</A>
-section in order to gain big speedup. It is important to do these steps
-<I>before</I> compiling <B>MPlayer</B>, otherwise no Matrox-specific support will be
-built. Also check out the <A HREF="video.html#2.3.1.A.1">Matrox TV-out</A>
-section.</LI>
+  <UL>
+    <LI><B>Karty Matrox G200/G400/G450/G550</B>: w celu uzyskania dużego
+zwiększenia prędkości zobacz sekcję <A HREF="video.html#2.3.1.7">mga_vid</A>.
+Ważne jest, aby wykonać te kroki <I>zanim</I> skompilujesz <B>MPlayera</B>, w
+przeciwnym razie żadne specjalne wsparcie dla Matroxa nie zostanie zbudowane.
+Zobacz również sekcję <A HREF="video.html#2.3.1.A.1">Matrox TV-out</A>.</LI>
 
-<LI><B>Karty 3Dfx Voodoo3/Banshee</B> : please see the <A
-HREF="video.html#2.3.1.9">2.3.1.9</A> section in order to gain big speedup. It
-is important to do these steps <I>before</I> compiling <B>MPlayer</B>,
-otherwise no 3Dfx support will be built. Also see the <A HREF="video.html#2.3.1.A.3">3dfx
-TV out section</A>.</LI>
+<LI><B>Karty 3Dfx Voodoo3/Banshee</B>: w celu uzyskania dużego zwiększenia
+prędkości zobacz sekcję <A HREF="video.html#2.3.1.9">2.3.1.9</A>. Ważne jest,
+aby wykonać te kroki <I>zanim</I> skompilujesz <B>MPlayera</B>, w przeciwnym
+razie żadne wsparcie dla 3Dfx nie zostanie zbudowane. Zobacz również sekcję <A
+HREF="video.html#2.3.1.A.3">3dfx TV-out</A>.</LI>
 
-<LI><B>Karty ATI</B> : see the <A HREF="video.html#2.3.1.A.2">ATI cards
-section</A> of the TV-out documentation, to know what features of your card is
-supported under Linux/MPlayer. If you have a <B>Radeon</B> or <B>Rage128</B> card, we have a
-<B>XXX_vid</B> driver for you, with TV out ! Check <A
-HREF="video.html#2.3.1.14">this</A> section !</LI>
+<LI><B>Karty ATI</B>: zobacz sekcję <A HREF="video.html#2.3.1.A.2">karty
+ATI</A> z dokukmentacji TV-out, aby się dowiedzieć, jakie właściwości twojej
+karty są obsługiwane pod Linuksem/MPlayerem. Jeżeli masz kartę <B>Radeon</B>
+lub <B>Rage128</B>, mamy dla ciebie sterownik <B>XXX_vid</B>, z wyjściem TV!
+Sprawdź <A HREF="video.html#2.3.1.14">tą</A> sekcję!</LI>
 
-<LI><B>Karty S3</B> : the Savage chips have hardware acceleration. Use as
-new XFree86 version as possible, older drivers are buggy. Savage chips
-have problems with YV12 display, see <A HREF="video.html#2.3.1.2.2">S3 Xv
-section</A> for details. Older, non-Savage cards have no, or slow hardware
-support.</LI>
+<LI><B>Karty S3</B>: chipy Savage posiadają akcelerację sprzętową. Używaj tak
+nowej wersji XFree86, jak to tylko możliwe. Starsze sterowniki zawierają błędy.
+Chipy Savage mają kłopoty z wyswietlaniem YV12. Zobacz sekcję 
+<A HREF="video.html#2.3.1.2.2">S3 Xv</A>, aby dowiedzieć się więcej szczegółów.
+Starsze, karty - nie Savage, nie zawierają, bądź mają bardzo wolne wsparcie
+sprzętowe.</LI>
 
-<LI><B>Karty Nvidia</B> : very bad choice for video playing. Nvidia's
-cards are manufactured on the far-east, and have very cheap and bad
-quality chips. Moreover, <U>the built-in Nvidia driver in XFree86 doesn't
-contain support for hardware YUV acceleration!</U> You have to download
-Nvidia's closed-source drivers from nvidia.com . See details in <A
-HREF="video.html#2.3.1.2.3">Nvidia Xv driver</A> section.</LI>
+<LI><B>Karty Nvidia</B>: to bardzo zły wybór jeśli chodzi o odtwarzanie
+obrazów. Karty Nvidii są produkowane na Dalekim Wschodzie i zawierają bardzo
+tanie i złej jakości chipy. Co więcej, <U>wbudowany sterownik Nvidii w XFree86
+nie zawiera wsparcia dla sprzętowej akceleracji YUV!</U> Musisz ściągnąć
+sterowniki Nvidii, które są closed-source, ze strony nvidia.com. Zobacz więcej
+szczegółów w sekcji <A HREF="video.html#2.3.1.2.3"> Sterowniki Nvidia Xv</LI>.
 
-<LI><B>Inne karty</B> : none of the above?
+<LI><B>Inne karty</B>: żadna z wyżej wymienionych?
   <UL>
-    <LI>Try if the XFree86 driver (and your card) supports hardware
-      acceleration. See the <A HREF="video.html#2.3.1.2">Xv section</A> for
-      details.</LI>
-    <LI>If it doesn't, your card is one of the :</LI>
+    <LI>Sprawdź czy sterownik XFree86 (i twoja karta) obsługuje akcelerację
+sprzętową. Szczegóły znajdziesz w sekcji <A HREF="video.html#2.3.1.2">Xv</A>.
+</LI>
+    <LI>Jeśli nie, twojej karty należy szukać tutaj:</LI>
   </UL>
 </LI>
 
@@ -431,19 +446,17 @@
 <P>
 <B><I>Karty bez YUV</I></B></P>
 
-<P>
-Fullscreen playing can be achieved by either zooming
-(<B>by software</B>, this is slooow), or changing to a smaller videomode, for
-example to 352x288. If you don't have YUV accel, this latter method is
-the recommended one. Throughout <B>MPlayer</B>, <U>this behaviour can
-be switched on by using the <CODE>-vm</CODE> option</U> and with
-the following drivers :
+<P> Pełnoekranowe odgrywanie może być osiągnięte albo przez (<B>sprzętowy</B>,
+zbyt wolny) zooming, albo przez zmianę na mniejszy trybu video (videomode), np.
+na 352x288. Jeśli nie masz akceleracji YUV, ta druga metoda jest
+rekomendowana. Za pomocą <B>MPlayera</B>, <U>to zachowanie może być włączone za
+pomocą opcji <CODE>-vm</CODE></U>  z następującymi sterownikami:
 <UL>
-  <LI><B>using</B> XFree86 : see details in
-    <A HREF="video.html#2.3.1.3">DGA driver</A> and
-    <A HREF="video.html#2.3.1.13">X11 driver</A> sections. DGA is
-    recommended!</LI>
-  <LI><B>not using</B> XFree86 : try the drivers in the following order :
+  <LI><B>using</B> XFree86: zobacz szczegóły w sekcji:
+    <A HREF="video.html#2.3.1.3">sterownik DGA</A> oraz
+    <A HREF="video.html#2.3.1.13">sterownik X11</A>. DGA jest
+rekomendowany!</LI>
+  <LI><B>nie używając</B> XFree86: spróbuj kolejno tych sterowników:
     <A HREF="video.html#2.3.1.12">vesa</A>,
     <A HREF="video.html#2.3.1.6">fbdev</A>,
     <A HREF="video.html#2.3.1.5">svgalib</A>,
@@ -455,42 +468,43 @@
 
 <UL>
 
-<LI><B>Soundblaster Live!</B> : with this card you can use 4 or 6 (<B>5.1</B>)
-channels AC3 decoding instead of 2. Read the
-<A HREF="codecs.html#2.2.2.1">Software AC3 decoding</A> section.</LI>
+<LI><B>Soundblaster Live!</B>: z tą kartą możesz używać 4 lub 6 (<B>5.1</B>)
+kanałów dekodowania AC3, zamiast, jak dotąd, 2. Przeczytaj sekcję <A
+HREF="codecs.html#2.2.2.1">Programowe dekodowanie AC3</A>.</LI>
 
-<LI><B>other cards'</B> features aren't supported by <B>MPlayer</B>.
-  <U>It's very recommended to read the <A HREF="sound.html#2.3.2">soundcards
-  section</A> !</U>
+<LI>właściwości <B>innych kart</B> nie są obsługiwane przez <B>MPlayera</B>.
+  <U>Bardzo zaleca się przeczytanie sekcji<A HREF="sound.html#2.3.2">karty
+dźwiękowe</A>!</U>
 </UL>
 
 <P><B><I>WŁAŚCIWOŚCI</I></B></P>
 
 <UL>
-<LI>For DVD support, you'll have to compile libdvdcss and libdvdread, and
-in this order!
-See <A HREF="cd-dvd.html#4.2">section 4.2</A> for more information.</LI>
+<LI>Aby mieć obsługę DVD, musisz skompilować libdvdcss i libdvdread, dokładnie
+w takiej kolejności! Zobacz szczegóły w <A HREF="cd-dvd.html#4.2">sekcji
+4.2</A>.</LI>
 
-<LI>Decide if you need GUI. If you do, see the <A HREF=#1.4>1.4 section</A>
-before compiling.</LI>
+<LI>Zdecyduj czy potrzebujesz GUI. Jeżeli tak, zobacz, przed kompilacją, 
+<A HREF=#1.4>sekcję 1.4</A> .</LI>
 
-<LI>If you want to install <B>MEncoder</B> (our great all-purpose encoder),
-see the <A HREF="encoding.html#2.4">MEncoder section</A> .</LI>
+<LI>Jeżeli chcesz zainstalować <B>MEncoder</B> (nasz wspaniały wszechstronny
+koder), zobacz sekcję <A HREF="encoding.html#2.4">MEncoder</A>.</LI>
 
 
-<LI>If you have a V4L compatible <B>TV tuner</B> card, and wish to watch/grab and
-encode movies with <B>MPlayer</B>, read the <A HREF=#2.5>TV input</A> section.</LI>
+<LI>Jeżeli masz <B>tuner TV</B> zgodny z V4L i chcesz oglądać/nagrywać oraz 
+kodować filmy za pomocą <B>MPlayera</B>, przeczytaj sekcję <A HREF=#2.5>wejście
+TV</A>.</LI>
 
-<LI>There are two timer codes in <B>MPlayer</B>. To use the old
-method, you don't have to do anything. It uses <CODE>usleep()</CODE> to tune
-A/V sync, with +/- 10ms accuracy. However sometimes the sync has to be tuned
-even finer. The new timer code uses PC's RTC (Real Time Clock) for this task,
-because it has precise 1ms timers. This requires root, or a <I>setuid root</I>
-<B>MPlayer</B> binary (or a little kernel hacking, but that's unadvised). You
-can see the new timer's efficiency in the status line. Note: <B>NEVER install
-setuid MPlayer binary on a multiuser system!</B> It's a clear way for everyone
-to gain root.</LI>
-
+<LI>Są dwa kody timera w <B>MPlayerze</B>. Aby użyć starej metody, nie
+musisz robić nic. Stosuje ona <CODE>usleep()</CODE>, aby dostroić A/V sync, z
+dokładnością +/- 10ms. Jakkolwiek, czasami synchronizacja musi być dostrojona
+nawet lepiej. Nowy kod timera w tym celu RTC (Real Time Clock) komputera,
+ponieważ ma on precyzyjność taką, jak timers 1ms. Wymaga to uprawnień roota
+(ew. <I>setuid root</I>) dla binariów <B>MPlayera</B> (lub drobnych zmian w
+jądrze, ale to jest odradzane). Możesz zobaczyć wydajność nowego timera w
+status line. Uwaga: <B>NIGDY nie instaluj binariów MPlayera jako setuid w
+systemie wielu użytkowników!</B> To prosta droga dla każdego, by zdobyć
+uprawnienia roota.</LI>
 </UL>
 
 <P>Then build <B>MPlayer</B>:</P>
@@ -499,6 +513,11 @@
     make
     make install</PRE>
 
+<P><B>Debian users</B> can build a .deb package for themselves, it's very
+simple. Just exec <CODE>fakeroot debian/rules binary</CODE> in <B>MPlayer</B>'s
+root dir. Detailed instructions can be found <A
+HREF="documentation.html#6.1">here</A>.</P>
+
 <P><B><I>ALWAYS browse the output of ./configure</I></B>, and the
 <CODE>configure.log</CODE> file, they contain info about what will be built,
 and what won't. You may also want to view config.h and config.mak files.</P>
@@ -609,6 +628,7 @@
 It's a complete tool to convert from TTF/Type1/etc font to mplayer font pkg.
 (read TOOLS/subfont-c/README for details)
 
+
 <LI>use the font generator GIMP plugin at TOOLS/subfont-GIMP
 (note: you must have HSI RAW plugin too, see URL below)
 </UL>
@@ -652,21 +672,18 @@
 
 <P>
 <UL>
-  <LI>first, you have to add the <CODE>--enable-tv</CODE> flag to <CODE>./configure</CODE>,
-    and recompile.</LI>
+    <LI>first, you have to recompile. <CODE>./configure</CODE> will autodetect
+kernel headers of v4l stuff, and the existence of /dev/video* entries. If they
+exist, TV support will be built (see configure's output!).</LI>
   <LI>make sure your tuner works with another TV softwares in Linux, for example
-    xawtv.</LI>
+xawtv.</LI>
 </UL>
 </P>
 
-<P><B>Hint</B>: if <B>MPlayer</B> prints <CODE>ioctl: can't sync</CODE> or something
-  like this, your tuner can't capture the requested image size. Try using
-  <CODE>width=640:height=480</CODE> options.</P>
-
-<P><B>Hint #2</B> : are the colors fucked up? Then your tuner can't display
-  in YV12 colorspace. Try YUY2, UYVY or if none of these works: RGB32 (this one
-  with <CODE>-vo sdl</CODE>).
-  You can specify these with the <CODE>outfmt=YV12</CODE> option see below.</P>
+<P><B>Hint</B> : are the colors messed up? Then your tuner can't display in
+YV12 colorspace. Try I420 (you must use the <CODE>-vc rawi420</CODE> option
+too!), or YUY2, UYVY, RGB32 (this one with <CODE>-vo sdl</CODE>) colorspaces.
+You can specify these with the <CODE>outfmt=YV12</CODE> option see below.</P>
 
 <P><B><I>Available options</I></B><BR>
 <TABLE BORDER=0>
@@ -1099,7 +1116,7 @@
 
 <P><UL>
 
-<LI><B><A HREF="mailto:arpi@thot.banki.hu">Árpád Gereöffy (A'rpi/ESP-team)</A></B>
+<LI><B><A HREF="mailto:send mail to mplayer-users!">Árpád Gereöffy (A'rpi/ESP-team)</A></B>
 <UL>
   <LI>player code (mpeg stream demultiplexer and avi/asf parser, A-V sync, seek...)</LI>
   <LI>mp3lib, based on mpglib sources  [MP3 audio decoder]</LI>
@@ -1184,6 +1201,13 @@
   <LI>xanim codecs support (incomplete yet!)</LI>
   <LI>VIVO files support</LI>
   <LI>TV grabbing support</LI>
+  <LI>Quicktime hackings</LI>
+  <LI>libavcodec support in MEncoder</LI>
+  <LI>RM fileformat demuxer</LI>
+  <LI>mencoder framecopy</LI>
+  <LI>yuv4mpeg support</LI>
+  <LI>subconfig</LI>
+  <LI>various stuff</LI>
 </UL></LI>
 
 <LI><B><A HREF="mailto:asackerm@stud.informatik.uni-erlangen.de">Andreas Ackermann (Acki)</A></B>
@@ -1204,6 +1228,7 @@
   <LI>OggVorbis audio support</LI>
   <LI>Various aspect code</LI>
   <LI>Win32 port</LI>
+  <LI>priority support in codecs.conf</LI>
 </UL></LI>
 
 <LI><B><A HREF="mailto:telenieko@telenieko.com">TeLeNiEkO</A></B>
@@ -1248,12 +1273,12 @@
 <LI><B><A HREF="mailto:marcus@idonex.se">Marcus Comstedt</A></B>
 <UL>
   <LI>initial solaris8-x86 support</LI>
+  <LI>configure fixes</LI>
 </UL></LI>
 
-<LI><B><A HREF="mailto:jk@tools.de">Jürgen Keil and Marcus Comstedt</A></B>
+<LI><B><A HREF="mailto:jk@tools.de">Jürgen Keil</A></B>
 <UL>
   <LI>patched <B>MPlayer</B> to work on Solaris 8 x86</LI>
-  <LI>configure fixes</LI>
   <LI>various fixes (win32, configure, etc)</LI>
   <LI>SUN audio driver in libao2</LI>
   <LI>mediaLib support in libavcodec</LI>
@@ -1297,18 +1322,24 @@
 
 <LI><B><A HREF="mailto:iive@yahoo.com">Ivan Kalvatchev</A></B>
 <UL>
-  <LI>interlaced MPEG2 support</LI>
+  <LI>interlaced MPEG2 support (libmpeg2)</LI>
+  <LI>libvo2 draft</LI>
 </UL></LI>
 
 <LI><B><A HREF="mailto:p_l@gmx.fr">pl</A></B>
 <UL>
-  <LI>./configure fixes</LI>
+  <LI>new ./configure script</LI>
+  <LI>general code maintaining, fixes, patch commiting</LI>
 </UL></LI>
 
 <LI><B><A HREF="mailto:michaelni@gmx.at">Michael Niedermayer</A></B>
 <UL>
-  <LI>postprocessing support</LI>
+  <LI>new postprocessing code (with deinterlacing etc...)</LI>
   <LI>software scaling C/MMX/MMX2/3DNow support (swscale.c)</LI>
+  <LI>various rgb/yuv bpp converters</LI>
+  <LI>new, better IDCT code for libavcodec</LI>
+  <LI>runtime cpu detection</LI>
+  <LI>SSE optimization of liba52</LI>
 </UL></LI>
 
 <LI><B><A HREF="mailto:sgoethel@jausoft.com">Sven Goethel</A></B>
@@ -1323,7 +1354,7 @@
 
 <LI><B><A HREF="mailto:eanholt@gladstone.uoregon.edu">Eric Anholt</A></B>
 <UL>
-  <LI>runtime CPU detection</LI>
+  <LI>CPU detection code</LI>
 </UL></LI>
 
 <LI><B><A HREF="mailto:Jiri.Svoboda@seznam.cz">Jiri Svoboda</A></B>
@@ -1347,6 +1378,7 @@
 <LI><B><A HREF="mailto:dholm@telia.com">David Holm</A></B>
 <UL>
   <LI>DXR3 support</LI>
+  <LI>libmp1e import</LI>
 </UL></LI>
 
 <LI><B><A HREF="mailto:takis@lumumba.luc.ac.be">Panagiotis Issaris</A></B>
@@ -1358,6 +1390,7 @@
 <UL>
   <LI>MS Video1 codec open-source implementation</LI>
   <LI>FLI demuxer, decoder</LI>
+  <LI>Generic ADPCM decoder (supports stereo IMA4 too)</LI>
 </UL></LI>
 
 <LI><B><A HREF="mailto:ranma@gmx.at">Tobias Diedrich</A></B>
@@ -1369,7 +1402,28 @@
 <UL>
   <LI>-slave mode</LI>
 </UL></LI>
-
+<LI><B><A HREF="mailto:timf@mail.csse.monash.edu.au">Tim Ferguson</A></B>
+<UL>
+  <LI>Opensource Cinepak decoder</LI>
+</UL></LI>
+<LI><B><A HREF="mailto:itrs@softwell.com.tw">Sam Lin</A></B>
+<UL>
+  <LI>-wid (plugger) patch</LI>
+</UL></LI>
+<LI><B><A HREF="mailto:johannes.feigl@mcse.at">Johannes Feigl</A></B>
+<UL>
+  <LI>german docs translation</LI>
+  <LI>some improvements in configure, small patches</LI>
+  <LI>found somebody (Thilo Wunderlich) how send a DVB card</LI>
+</UL></LI>
+<LI><B><A HREF="mailto:kmkaplan@selfoffice.com">Kim Minh Kaplan</A></B>
+<UL>
+  <LI>DVD subtitles display support</LI>
+</UL></LI>
+<LI><B><A HREF="mailto:bkuschak@yahoo.com">Brian Kuschak</A></B>
+<UL>
+  <LI>RTP streaming support (reading)</LI>
+</UL></LI>  
 </UL></P>
 
 <P>Main testers:</P>
@@ -1560,6 +1614,15 @@
 <LI>send user questions here (after reading all this documentation)</LI>
 </UL></P>
 
+</LI><LI>MPlayer hungarian users list:<BR>
+<A HREF="http://mplayerhq.hu/mailman/listinfo/mplayer-felhasznalok">http://mplayerhq.hu/mailman/listinfo/mplayer-felhasznalok</A>
+<P>
+  <UL>
+    <LI>hungarian language list</LI>
+    <LI>topic? We'll see about it...</LI>
+  </UL>
+</P>
+
 </LI><LI>Lista użytkowników MPlayera posiadających Matrox G200/G400/G450/G550:<BR>
 <A HREF="http://lists.sourceforge.net/lists/listinfo/mplayer-matrox">http://lists.sourceforge.net/lists/listinfo/mplayer-matrox</A>
 <P>Send matrox-related questions here<UL>
@@ -1619,6 +1682,10 @@
   (for example compiled on P3 and running on celeron)<BR>
   Solution: compile MPlayer on the same machine where you will use it!<BR>
   Workaround: ./configure --disable-sse etc. options</LI>
+<LI>"Internal buffer inconsistency" during MEncoder run:<BR>
+Problem: known gcc 2.96 bug, no fix yet. If you have gcc 2.95, you
+have a libmp3lame library that was compiled with gcc 2.96 (installed from
+a deb/rpm package?). Check which lib does MEncoder found : ldd mencoder.</LI>
 </UL>
 
 <P>Various A-V sync and other audio problems:</P>
--- a/DOCS/Polish/encoding.html	Sat Dec 29 16:43:24 2001 +0000
+++ b/DOCS/Polish/encoding.html	Sat Dec 29 18:46:10 2001 +0000
@@ -5,7 +5,8 @@
 
 <P><B><A NAME=2.4>2.4.  Encoding with MEncoder</A></B></P>
 
-<A NAME=2.4.1><P><B><I>Overview</I></B>
+<P><B><A NAME=2.4.1>2.4.1.  Overview</B></P>
+
 <P><B>MEncoder</B> (<B>MPlayer</B>'s Movie Encoder) is a simple movie encoder,
 designed to encode MPlayer-playable movies
 (<B>AVI/DVD/VCD/VOB/MPG/MOV/VIV/NET</B>) to other MPlayer-playable formats (see
@@ -14,15 +15,19 @@
 copying abilities. In the future, there will be cropping, resizing filters, and
 other interesting stuff.</P>
 
-<A NAME=2.4.2><P><B><I>Compiling</I></B>
+<P><B><A NAME=2.4.2>2.4.2.  Compiling</B></P>
+
+<P>
   <UL>
-    <LI>read <B>MPlayer</B>'s compilation instructions, it contains info about
+    <LI><B>OPTIONAL</B> - read <B>MPlayer</B>'s compilation instructions, it contains info about
       how to install <I>libdvdread</I> for <B>DVD</B> support, etc.</LI>
-    <LI>download the newest <B>DivX4linux</B> libs
+    <LI><B>OPTIONAL</B> - download the newest <B>DivX4linux</B> libs
       from <A HREF="http://avifile.sourceforge.net/download.htm">avifile.sourceforge.net</A>,
       and have them PROPERLY installed. This is needed for DivX4 (1/2 pass)
       encoding. And since this is mandatory (now), MEncoder is Linux-only.</LI>
-    <LI>download and compile <B>libmp3lame</B> (from lame 3.89beta or lame CVS).<BR>
+    <LI><B>OPTIONAL</B> - for libavcodec support, install libavcodec as
+      described in the <A HREF="codecs.html#2.2.1.2">libavcodec section</A>.</LI>
+    <LI><B>OPTIONAL</B> - download and compile <B>libmp3lame</B> (from lame 3.89beta or lame CVS).<BR>
       <B>WARNING : DO NOT COMPILE LAME WITH <U>GCC 2.96</U> ! It won't
       work properly !</B><BR>
       This
@@ -43,7 +48,9 @@
 <P>You are ready. As you probably know, other encoding tools need the
 <I>avifile</I> library installed. <B>MEncoder</B> doesn't need it at all.</P>
 
-<A NAME=2.4.3><P><B><I>MEncoder features</I></B> :
+<P><B><A NAME=2.4.3>2.4.3.  MEncoder features</B></P>
+
+<P>
   <UL>
     <LI>encoding from the wide range of fileformats and decoders of <B>MPlayer</B></LI>
     <LI>encoding from <B>V4L compatible TV tuners</B></LI>
@@ -68,12 +75,12 @@
   </UL>
 </P>
 
-<A NAME=2.4.3.1><P><B><I>Encoding 2-pass DivX4</I></B></P>
+<P><B><A NAME=2.4.3.1>2.4.3.1.  Encoding 2-pass DivX4</B></P>
 
 <P>The name comes from the fact that this method encodes the file <I>twice</I>.
-The first encoding (dubbed <I>pass</I>) creates some temporary files with a
-size of few megabytes (do not delete them yet). In the second pass, the output
-file is created, using the bitrate data from the temporary file. The resulting
+The first encoding (dubbed <I>pass</I>) creates some temporary files (*.log) with a
+size of few megabytes, do not delete them yet (you can delete the AVI). In the second pass, the
+2-pass output file is created, using the bitrate data from the temporary files. The resulting
 file will have much better image quality. If this is the first time you heard
 about this, you should consult some guides available on the Net.</P>
 
@@ -83,7 +90,7 @@
 -o movie.avi -pass 1<BR>
 &nbsp;&nbsp;&nbsp;&nbsp;mencoder -dvd 2 -ovc divx4 -oac mp3lame -divx4opts br=1100 -o movie.avi -pass 2</CODE></P>
 
-<A NAME=2.4.3.2><P><B><I>Rescaling movies</I></B></P>
+<P><B><A NAME=2.4.3.2>2.4.3.2.  Rescaling movies</B></P>
 
 <P>Often the need to resize movie images' size emerges. Its reasons can be many,
   examples are decreasing output file size, encoding SVCDs to DivX. Ripped DVDs
@@ -94,16 +101,18 @@
   AVI (DivX) files, you have be aware that AVI headers don't store this
   value. Thus, the only solution is rescaling.</P>
 
-<P>The output size is specified with the <CODE>-x</CODE>, and <CODE>-y</CODE>
-  options.  Furthermore, there are 3 rescaling filters in <B>MEncoder</B>, <I>0
-  : fast 1 : bilinear</I>, <I>2 : bilinear</I>, <I>bicubic</I> (best quality).
+<P><B>MEncoder can scale input images if they come in YV12 format (for example:
+  ffdivx, odivx drivers, or mpeg1/2). The output size is specified with the
+  <CODE>-x</CODE>, and <CODE>-y</CODE> options.  Furthermore, there are 3
+  rescaling filters in <B>MEncoder</B>, <I>0
+  : fast bilinear</I>, <I>1 : bilinear</I>, <I>2 : bicubic</I> (best quality). 
   They can be specified with the <CODE>-sws</CODE> option. If not specified,
   <B>MEncoder</B> will use 0 : fast bilinear.</P>
 
 <P>Rescaling is very simple :<BR>
 <CODE>&nbsp;&nbsp;&nbsp;&nbsp;mencoder sample-svcd.mpg -divx4opts br=1300 -x 640 -y 480 -sws 2 -o output.avi</CODE></P>
 
-<A NAME=2.4.3.3><P><B><I>Stream copying</I></B></P>
+<P><B><A NAME=2.4.3.3>2.4.3.3.  Stream copying</B></P>
 
 <P><B>MEncoder</B> can handle input streams in two ways : <B>encode</B> or
   <B>copy</B> them. This section is about <B>copying</B>.</P>
@@ -121,11 +130,41 @@
 </UL>
 </P>
 
-<A NAME=2.4.4><P><B><I>Syntax</I></B></P>
+<P><B><A NAME=2.4.3.4>2.4.3.4.  Fixing AVIs with broken index</B></P>
+
+<P>Easiest thing. We simply copy the video and audio streams, and
+<B>MEncoder</B> generates the index. Of course this cannot fix possible bugs in
+the video and/or audio streams.</P>
+
+<P>Command : <CODE>mencoder input.avi -ovc copy -oac copy -o output.avi</CODE></P>
+
+
+<P><B><A NAME=2.4.3.5>2.4.3.5.  Encoding with the <I>libavcodec</I> codec family</B></P>
+
+<P>libavcodec provides simple encoding to a lot of interesting video and audio
+formats (currently its audio codecs are unsupported). You can encode to the
+following codecs :</P>
+
+<P>
+<UL>
+  <LI>mjpeg - Motion JPEG</LI>
+  <LI>h263 - H263</LI>
+  <LI>h263p - H263 Plus</LI>
+  <LI>mpeg4 - DivX4</LI>
+  <LI>msmpeg4 - the old DivX</LI>
+  <LI>rv10 - an old RealVideo codec</LI>
+  <LI>mpeg1video - MPEG1 video :)</LI>
+</UL>
+</P>
+
+<P>The first column contains the codec names that should be passed after the
+  <CODE>vcodec</CODE> config, like : <CODE>-lavcopts vcodec=msmpeg4</CODE></P>
+
+<P><B><A NAME=2.4.4>2.4.4.  Syntax</B></P>
 
 <P>&nbsp;&nbsp;<CODE>mencoder [options] [input file] [options] ...</P>
 
-<A NAME=2.4.5><P><B><I>Available options</I></B></P>
+<P><B><A NAME=2.4.5>2.4.5.  Available options</B></P>
 
 <P>NOTE : for all available options, <B>read the manpage !</B></P>
 
@@ -179,6 +218,7 @@
     &nbsp;&nbsp;<B>help</B> - get list of available codecs<BR>
     &nbsp;&nbsp;<B>copy</B> - no encoding, just copy the stream (only from AVI/ASF now)<BR>
     &nbsp;&nbsp;<B>divx4</B> - encode to DivX4<BR>
+    &nbsp;&nbsp;<B>lavc</B> - encode with a codec from libavcodec<BR>
   </TD>
 </TR>
 <TR>
@@ -206,6 +246,23 @@
     &nbsp;&nbsp;<B>help</B> - get help<BR>
     &nbsp;&nbsp;<B>br</B>=XXX - specify bitrate in kbit &lt;4-16000&gt; or bit &lt;16001-24000000&gt;<BR>
     &nbsp;&nbsp;<B>q</B>=XXXX - quality (1-fastest, 5-best - default 5)<BR>
+    &nbsp;&nbsp;<B>key</B>=XXXX - keyframe interval<BR>
+  </TD>
+</TR>
+<TR>
+  <TD>&nbsp;&nbsp;</TD>
+  <TD><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>
+    <I>-lavcopts</I></TD>
+  <TD>&nbsp;&nbsp;</TD>
+  <TD><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>
+    If encoding with libavcodec, you can specify its parameters here, like:<BR>
+    &nbsp;&nbsp;<CODE>-lavcopts vcodec=msmpeg4:vbitrate=1800:vhq:keyint=250</CODE><BR>
+    Common options: <B>(for full list, check the manpage!)</B><BR>
+    &nbsp;&nbsp;<B>help</B> - get help<BR>
+    &nbsp;&nbsp;<B>vcodec</B>=XXX - select videocodec (for the full list, see the libavcodec section above)<BR>
+    &nbsp;&nbsp;<B>vbitrate</B>=XXX - specify bitrate in kbit &lt;4-16000&gt; or bit &lt;16001-24000000&gt;<BR>
+    &nbsp;&nbsp;<B>vhq</B> - high quality<BR>
+    &nbsp;&nbsp;<B>keyint</B>=XXX - keyframe interval<BR>
   </TD>
 </TR>
 <TR>
@@ -226,13 +283,16 @@
 </TR>
 </TABLE>
 
-<A NAME=2.4.6><P><B><I>Examples</I></B></P>
+<P><B><A NAME=2.4.6>2.4.6.  Examples</B></P>
 
 <P>Using <B>MEncoder</B> is the easiest thing on Earth. See the following :</P>
 
 <P>Encoding from DVD, title 2 :<BR>
   <CODE>&nbsp;&nbsp;&nbsp;&nbsp;mencoder -dvd 2 -o title2.avi</CODE></P>
 
+<P>The same, but with libavcodec family, MJPEG compression :<BR>
+  <CODE>&nbsp;&nbsp;&nbsp;&nbsp;mencoder -dvd 2 -o title2.avi -ovc lavc -lavcopts vcodec=mjpeg -ffourcc mjpg</CODE></P>
+
 <P>Encoding from DVD, title 2, with rescaling :<BR>
   <CODE>&nbsp;&nbsp;&nbsp;&nbsp;mencoder -dvd 2 -x 640 -y 480 -sws 2 -o title2.avi</CODE></P>
 
--- a/DOCS/Polish/faq.html	Sat Dec 29 16:43:24 2001 +0000
+++ b/DOCS/Polish/faq.html	Sat Dec 29 18:46:10 2001 +0000
@@ -72,7 +72,7 @@
 (with default options) Mandrake or RedHat or Suse, and without RTFM'ing they
 send messages saying 'it doesn't work! help me! please! i'm new to the linux!
 help! oh! help me!'. We can't stop them, but at least we try to force them RTFM
-and to read fuckin' messages of ./configure and mplayer.</P>
+and to read messages of ./configure and mplayer.</P>
 
 <P>And you clever guys come and flame us with gcc 2.96 and binary packages.
 Instead of helping users or making patches to help solve problems.</P>
@@ -183,11 +183,7 @@
 shared object file: No such file or directory</CODE><BR>
 I checked up on the file and it IS there in /usr/local/lib.
 </B></TD><TR><TD></TD><TD VALIGN=top><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>A:</TD><TD><font face="Verdana, Arial, Helvetica, sans-serif" size="2">
-What are you doing on Linux? Can't you install a library? Why do
-we get these questions? It's not <B>MPlayer</B> specific at all! Add
-/usr/local/lib to <B>/etc/ld.so.conf</B> and run <B>ldconfig</B> .
-Or install it to /usr/lib , because if you can't solve the /usr/local
-problem, you are careless enough to do such things.
+Add /usr/local/lib to <B>/etc/ld.so.conf</B> and run <B>ldconfig</B> .
 </TD><TR><TD COLSPAN=3>&nbsp;</TD><TR>
 
 <TD></TD><TD VALIGN=top><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>Q:</TD><TD WIDTH=100%><B><font face="Verdana, Arial, Helvetica, sans-serif" size="2">
@@ -217,7 +213,7 @@
 <TD></TD><TD VALIGN=top><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>Q:</TD><TD WIDTH=100%><B><font face="Verdana, Arial, Helvetica, sans-serif" size="2">
 I'd like to compile <B>MPlayer</B> on Minix !
 </B></TD><TR><TD></TD><TD VALIGN=top><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>A:</TD><TD><font face="Verdana, Arial, Helvetica, sans-serif" size="2">
-Me too.
+Me too. :)
 </TD><TR><TD COLSPAN=3>&nbsp;</TD><TR>
 
 
@@ -362,10 +358,10 @@
 <TD></TD><TD VALIGN=top><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>Q:</TD><TD WIDTH=100%><B><font face="Verdana, Arial, Helvetica, sans-serif" size="2">
 The GUI isn't usable with icewm, because some panel are over the movie!!
 </B></TD><TR><TD></TD><TD VALIGN=top><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>A:</TD><TD><font face="Verdana, Arial, Helvetica, sans-serif" size="2">
-Known, icewm is shit and dictatoric. Unsolvable. In detail: icewm sucks
-because its taskbar overrides GUI's window resize queries. If it asks for
+Known, icewm is dictatoric. Unsolvable. In detail:
+its taskbar overrides GUI's window resize queries. If it asks for
 resize to 800x600, then it resizes window to 800x(600-taskbar_size). It's bad.
-Very bad. In short: shit.
+Very bad.
 </TD><TR><TD COLSPAN=3>&nbsp;</TD><TR>
 
 <TD></TD><TD VALIGN=top><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>Q:</TD><TD WIDTH=100%><B><font face="Verdana, Arial, Helvetica, sans-serif" size="2">
@@ -492,9 +488,9 @@
 This can have multiple reasons.<BR>
   <LI>your CPU <B>and/or</B> video card <B>and/or</B> bus is too SLOW. <B>MPlayer</B>
   displays a message if this is the case. (and the dropped frames counter is going up fast)</LI>
-  <LI>if it is an AVI, maybe it has shit interleaving. Try the <I>-ni</I> option.</LI>
-  <LI>your sound driver is shit, or you use ALSA 0.5 with <I>-ao oss</I>. See the <A HREF="sound.html">soundcards section</A>.</LI>
-  <LI>the AVI has shit header, try with the <I>-nobps</I> option, and/or <I>-mc 0</I> .</LI>
+  <LI>if it is an AVI, maybe it has bad interleaving. Try the <I>-ni</I> option.</LI>
+  <LI>your sound driver is buggy, or you use ALSA 0.5 with <I>-ao oss</I>. See the <A HREF="sound.html">soundcards section</A>.</LI>
+  <LI>the AVI has bad header, try with the <I>-nobps</I> option, and/or <I>-mc 0</I> .</LI>
 </TD><TR><TD COLSPAN=3>&nbsp;</TD><TR>
 
 <TD></TD><TD VALIGN=top><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>Q:</TD><TD WIDTH=100%><B><font face="Verdana, Arial, Helvetica, sans-serif" size="2">
@@ -538,15 +534,6 @@
 Update your <CODE>codecs.conf</CODE>
 </TD><TR><TD COLSPAN=3>&nbsp;</TD><TR>
 
-<TD></TD><TD VALIGN=top><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>Q:</TD><TD WIDTH=100%><B><font face="Verdana, Arial, Helvetica, sans-serif" size="2">
-I'm using the GUI. During startup, MPlayer prints :<BR>
-<PRE><CODE>Gtk-WARNING **: This process is currently running setuid or setgid.
-This is not a supported use of GTK+. You must create a helper
-program instead. For further details, see...</CODE></PRE>
-</B></TD><TR><TD></TD><TD VALIGN=top><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>A:</TD><TD><font face="Verdana, Arial, Helvetica, sans-serif" size="2">
-You can't use GTK in a suid-root binary, as pointed out in the GUI section.
-</TD><TR><TD COLSPAN=3>&nbsp;</TD><TR>
-
 
 <TD COLSPAN=3>
 <B><A NAME=5.4><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>5.4. Video/audio driver problems (vo/ao)</A></B>
@@ -602,7 +589,7 @@
 OpenGL (-vo gl) output doesn't work (hangup/black window/X11 errors/...).
 </B></TD><TR><TD></TD><TD VALIGN=top><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>A:</TD><TD><font face="Verdana, Arial, Helvetica, sans-serif" size="2">
 Your opengl driver doesn't support dynamic texture changes (glTexSubImage)
-It's known not to work with nVidia's binary shit.
+It's known not to work with nVidia's binary mess.
 It's known to work with Utah-GLX/DRI and Matrox G400 card. Also with
 DRI and Radeon card. It won't work with DRI others than these.
 it will not work with 3DFX cards because the 256x256 texture size limit.
@@ -661,7 +648,7 @@
 <TD></TD><TD VALIGN=top><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>Q:</TD><TD WIDTH=100%><B><font face="Verdana, Arial, Helvetica, sans-serif" size="2">
 I'd like to seek +/- 1 frames, instead of 10 seconds.
 </B></TD><TR><TD></TD><TD VALIGN=top><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>A:</TD><TD><font face="Verdana, Arial, Helvetica, sans-serif" size="2">
-This won't be done. It was, but then it fucked up A/V sync. Feel free to
+This won't be done. It was, but then it messed up A/V sync. Feel free to
 implement it, and send a patch. Don't ask for it.
 </TD><TR><TD COLSPAN=3>&nbsp;</TD><TR>
 
--- a/DOCS/Polish/formats.html	Sat Dec 29 16:43:24 2001 +0000
+++ b/DOCS/Polish/formats.html	Sat Dec 29 18:46:10 2001 +0000
@@ -16,11 +16,13 @@
 <LI> <A HREF="#2.1.1.3">ASF/WMV</A> 1.0 file format
 <LI> <A HREF="#2.1.1.4">QT/MOV</A> file format with (un)compressed headers
 <LI> <A HREF="#2.1.1.5">VIVO</A> format (.viv files)
+<LI> <A HREF="#2.1.1.6">FLI</A> format
+<LI> <A HREF="#2.1.1.7">RealMedia</A> format (.rm files)
+<LI> <A HREF="#2.1.1.8">NuppelVideo</A> format (.nuv files)
+<LI> <A HREF="#2.1.1.9">yuv4mpeg</A> format
 <LI> supports <A HREF="documentation.html#3.3">reading from stdin</A>, or network via HTTP
 </UL></P>
 
-<P>Note: about realmedia (.ra/.rm) support read the FAQ!</P>
-
 <P>It's important to clarify a popular mistake. When people see a file with
 <B>.AVI</B> extension, they instantly declare that isn't an MPEG file.
 That's not true. At least not entirely. If you tell them that such a file
@@ -157,6 +159,40 @@
 instructions.</P>
 
 
+<P><B><A NAME=2.1.1.6>2.1.1.6. FLI files</A></B></P>
+
+<P><B>FLI</B> is a very old fileformat used by Autodesk Animator, but it's
+a common fileformat for short animations on the Net. <B>MPlayer</B> demuxes
+and decodes FLI movies and is even able to seek within them (useful when
+looping with the -loop option). FLI files don't have keyframes, so picture
+will be messy for a short time after seeking.</P>
+
+
+<P><B><A NAME=2.1.1.7>2.1.1.7. RealMedia (RM) files</A></B></P>
+
+<P>Yes, <B>MPlayer</B> can read (demux) RealMedia (.rm) files. Seeking
+is under implementation, and RM has keyframes so it will be flawless.
+Here are the lists of the supported <A HREF="codecs.html#2.2.1.8">RealVideo</A>
+and <A HREF="codecs.html#2.2.2.5">RealAudio</A> codecs.
+
+
+<P><B><A NAME=2.1.1.8>2.1.1.8. NuppelVideo files</A></B></P>
+
+<P><A HREF="http://mars.tuwien.ac.at/~roman/nuppelvideo">NuppelVideo</A>
+is a TV grabber tool (AFAIK:). <B>MPlayer</B> can read its <CODE>.nuv</CODE>
+files (only NuppelVideo 5.0). Those files can contain uncompressed YV12,
+YV12+RTJpeg compressed, YV12 RTJpeg+lzo compressed, and YV12+lzo compressed
+frames, <B>MPlayer</B> decodes (and also <B>encodes</B> them with MEncoder to
+DivX/etc!) them all. Seeking is under implementation.</P>
+
+
+<P><B><A NAME=2.1.1.9>2.1.1.9. yuv4mpeg files</A></B></P>
+
+<P><A HREF="http://mjpeg.sourceforge.net">yuv4mpeg / yuv4mpeg2</A> is
+also a fileformat for TV grabbing, or so :) I know only one thing about it:
+we support it.</P>
+
+
 <P><B><A NAME=2.1.2>2.1.2. Audio formats</A></B></P>
 
 <P>Currently <B>MPlayer</B> is still a <B>Movie</B> and not a <B>Media</B>
--- a/DOCS/Polish/gcc-2.96-3.0.html	Sat Dec 29 16:43:24 2001 +0000
+++ b/DOCS/Polish/gcc-2.96-3.0.html	Sat Dec 29 18:46:10 2001 +0000
@@ -75,14 +75,12 @@
 <B>Odpowiedź:</B>
 </P>
 
-<P>
-Nie. To ty jesteś w błędzie!
+<P> Nie. To ty jesteś w błędzie!
 Kilka projektów (przeważnie tych, które zawierają wysoko zoptymalizowany kod
 inline asemblera) ma problemy z gcc 2.96. Na przykład: avifile, MESA / DRI,
-Wine, ffmpeg, lame.  Ale inne projekty już opracowały sposoby radzenia sobie z
-błędami gcc (zmieniając kod, który wywoływał błędy kompilatora), więc teraz
-działają dobrze.
-</P>
+Wine, ffmpeg, lame, NuppelVideo. Ale inne projekty już opracowały sposoby
+radzenia sobie z błędami gcc (zmieniając kod, który wywoływał błędy
+kompilatora), więc teraz działają dobrze. </P>
 
 <P>
 <B>Pytanie:</B> Nie! Mylicie się! Wszystko świetnie działa z gcc 2.96
--- a/DOCS/Polish/mencoder.1	Sat Dec 29 16:43:24 2001 +0000
+++ b/DOCS/Polish/mencoder.1	Sat Dec 29 18:46:10 2001 +0000
@@ -1,4 +1,4 @@
-.\" MEncoder (C) 2000-2001 Arpad Gereoffy <arpi@esp-team.scene.hu>
+.\" MEncoder (C) 2000-2001 Arpad Gereoffy <sendmail@to.mplayer-users>
 .\" This manpage was/is done by Gabucino
 .\"
 .TH MEncoder
@@ -27,6 +27,7 @@
 .RB [ \-ovc\ <video\ codec\ name> ]
 .RB [ \-oac\ <audio\ codec\ name> ]
 .RB [ \-divx4opts\ <codec\ options> ]
+.RB [ \-lavcopts\ <codec\ options> ]
 .RB [ \-lameopts\ <codec\ options> ]
 .RB [ \-pass\ <1/2> ]
 .RB [ \-passlogfile\ <filename> ]
@@ -36,6 +37,7 @@
 .RB [ \-x\ <rescale\ width> ]
 .RB [ \-y\ <rescale\ height> ]
 .RB [ \-sws\ <0-2> ]
+.RB [ \-ffourcc\ fourcc ]
 .I - or file or device
 .PP
 .SH DESCRIPTION
@@ -119,6 +121,7 @@
   -ovc help      get help
   -ovc copy      no encoding, just streamcopy
   -ovc divx4     encode to DivX4
+  -ovc lavc      encode with a libavcodec codec
 .TP
 .B \-oac <codecname>
 Encode with the given codec (codec names are from codecs.conf).
@@ -154,6 +157,24 @@
                          reaction ratio
 
 .TP
+.B \-lavcopts
+If encoding with a codec from libavcodec, you can specify its parameters here,
+like:
+
+  -lavcopts vcodec=msmpeg4:vbitrate=1800:vhq:keyint=250
+
+Available options:
+
+  help           get help
+  vcodec=XXX     use the specified codec
+                 (for full list, see html doc!)
+  vbitrate=XXX   specify bitrate in
+                 kbit <4-16000> or
+                 bit  <16001-24000000>
+  keyint=XXX     interval between keyframes
+                 (specify in frames)
+  vhq            very high quality
+.TP
 .B \-lameopts
 If encoding to MP3 with libmp3lame, you can specify its parameters here, like:
 
@@ -212,16 +233,23 @@
 .B \-sws (0-2>
 Type of scaling method
 
-    0            fast bilinear
+    0            fast bilinear (default)
     1            bilinear
     2            bicubic (best quality)
-
+.TP
+.B \-ffourcc fourcc
+Can be used to force the video fourcc of the output file. For example -ffourcc
+div3 will have the output file contain "div3" as video fourcc.
+.IP
 .SH FILES AND DIRECTORIES
 .IP
 .SH "EXAMPLES"
 .B Encoding DVD title #2
 mencoder -dvd 2 -o title2.avi
 .TP
+.B The same, but with libavcodec family, MJPEG compression
+mencoder -dvd 2 -o title2.avi -ovc lavc -lavcopts vcodec=mjpeg -ffourcc mjpg
+.TP
 .B Encoding from HTTP
 mencoder http://mplayer.hq/example.avi -o example.avi
 .TP
@@ -244,7 +272,7 @@
 Check documentation !
 
 MPlayer is (C) 2000-2001
-.I Arpad Gereoffy <arpi@thot.banki.hu>
+.I Arpad Gereoffy <sendmail@to.mplayer-users>
 
 This manpage is written and maintained by
 .I Gabucino .
--- a/DOCS/Polish/mplayer.1	Sat Dec 29 16:43:24 2001 +0000
+++ b/DOCS/Polish/mplayer.1	Sat Dec 29 18:46:10 2001 +0000
@@ -1,4 +1,4 @@
-.\" MPlayer (C) 2000-2001 Arpad Gereoffy <arpi@esp-team.scene.hu>
+.\" MPlayer (C) 2000-2001 Arpad Gereoffy <sendmail@to.mplayer-users>
 .\" This manpage was/is done by Gabucino
 .\"
 .TH MPlayer
@@ -8,39 +8,42 @@
 .B mplayer
 .RB [ \-gui ]
 .RB [ \-v ]
+.RB [ \-help / -h / --help ]
 .RB [ \-quiet ]
 .RB [ \-vo\ <driver>[:<device>] ]
 .RB [ \-ao\ <driver>[:<device>] ]
-.RB [ \-vcd\ track\ number ]
-.RB [ \-sb\ byte\ position ]
+.RB [ \-vcd\ <track\ number> ]
+.RB [ \-sb\ <byte\ position> ]
 .RB [ \-nosound ]
-.RB [ \-abs\ bytes ]
-.RB [ \-delay\ secs ]
+.RB [ \-abs\ <bytes> ]
+.RB [ \-delay\ <secs> ]
 .RB [ \-nobps ]
-.RB [ \-aid\ id ]
-.RB [ \-vid\ id ]
-.RB [ \-fps\ rate ]
-.RB [ \-mc\ seconds/5f ]
+.RB [ \-aid\ <id> ]
+.RB [ \-alang\ <audio\ stream\ languages> ]
+.RB [ \-vid\ <id> ]
+.RB [ \-fps\ <rate> ]
+.RB [ \-mc\ <seconds/5f> ]
 .RB [ \-fs ]
 .RB [ \-vm ]
 .RB [ \-zoom ]
-.RB [ \-x\ x ]
-.RB [ \-y\ y ]
-.RB [ \-xy\ factor ]
-.RB [ \-pp\ quality ]
-.RB [ \-include\ configfile ]
-.RB [ \-lircconf\ configfile ]
-.RB [ \-ffactor\ number ]
-.RB [ \-sub\ file ]
-.RB [ \-subfps\ rate ]
-.RB [ \-subdelay\ sec ]
+.RB [ \-x\ <x> ]
+.RB [ \-y\ <y> ]
+.RB [ \-sws\ <software\ scaler\ type> ]
+.RB [ \-xy\ <factor> ]
+.RB [ \-pp\ <quality> ]
+.RB [ \-include\ <config\ file> ]
+.RB [ \-lircconf\ <config\ file> ]
+.RB [ \-ffactor\ <number> ]
+.RB [ \-sub\ <filename> ]
+.RB [ \-subfps\ <rate> ]
+.RB [ \-subdelay\ <seconds> ]
 .RB [ \-z\ <0-8> ]
 .RB [ \-idx ]
 .RB [ \-forceidx ]
 .RB [ \-nodshow ]
 .RB [ \-noxv ]
 .RB [ \-forcexv ]
-.RB [ \-ss\ time ]
+.RB [ \-ss\ <time> ]
 .RB [ \-dumpaudio ]
 .RB [ \-dumpvideo ]
 .RB [ \-dumpstream ]
@@ -48,83 +51,128 @@
 .RB [ \-framedrop ]
 .RB [ \-nodouble ]
 .RB [ \-double ]
-.RB [ \-stereo\ mode ]
-.RB [ \-channels\ n ]
-.RB [ \-srate\ Hz ]
-.RB [ \-osdlevel\ level ]
-.RB [ \-config\ file ]
-.RB [ \-display\ name ]
+.RB [ \-stereo\ <mode> ]
+.RB [ \-channels\ <n> ]
+.RB [ \-srate\ <Hz> ]
+.RB [ \-osdlevel\ <level> ]
+.RB [ \-config\ <file> ]
+.RB [ \-display\ <name> ]
+.RB [ \-wid\ <window\ id> ]
 .RB [ \-unicode ]
 .RB [ \-utf8 ]
-.RB [ \-fsmode\ mode ]
-.RB [ \-vc\ video\ codec\ name ]
-.RB [ \-ac\ audio\ codec\ name ]
-.RB [ \-vfm\ video\ codec\ family ]
-.RB [ \-afm\ audio\ codec\ family ]
-.RB [ \-frames\ number ]
-.RB [ \-autoq\ quality ]
-.RB [ \-fb\ device ]
-.RB [ \-fbmode\ modename ]
-.RB [ \-fbmodeconfig\ filename ]
+.RB [ \-fsmode\ <mode> ]
+.RB [ \-vc\ <video\ codec\ name> ]
+.RB [ \-ac\ <audio\ codec\ name> ]
+.RB [ \-vfm\ <video\ codec\ family> ]
+.RB [ \-afm\ <audio\ codec\ family> ]
+.RB [ \-frames\ <number> ]
+.RB [ \-autoq\ <quality> ]
+.RB [ \-fb\ <device> ]
+.RB [ \-fbmode\ <modename> ]
+.RB [ \-fbmodeconfig\ <filename> ]
+.RB [ \-monitor_hfreq\ <horizontal\ frequency\ range> ]
+.RB [ \-monitor_vfreq\ <vertical\ frequency\ range> ]
+.RB [ \-monitor_dotclock\ <dotclock\ (or\ pixelclock)\ range> ]
 .RB [ \-benchmark ]
-.RB [ \-dvd\ titleid ]
-.RB [ \-chapter\ chapterid ]
-.RB [ \-dvdangle\ angleid ]
-.RB [ \-dvdkey\ key ]
-.RB [ \-skin\ skin ]
-.RB [ \-aspect\ ratio ]
-.RB [ \-monitoraspect\ ratio ]
-.RB [ \-subcp\ codepage ]
+.RB [ \-dvd\ <title\ id> ]
+.RB [ \-chapter\ <chapter\ id> ]
+.RB [ \-dvdangle\ <angle\ id> ]
+.RB [ \-alang\ <country\ code> ]
+.RB [ \-slang\ <country\ code> ]
+.RB [ \-sid\ <subtitle \id> ]
+.RB [ \-dvdkey\ <key> ]
+.RB [ \-skin\ <skin\ name> ]
+.RB [ \-aspect\ <ratio> ]
+.RB [ \-monitoraspect\ <ratio> ]
+.RB [ \-subcp\ <codepage> ]
 .RB [ \-dumpmpsub ]
-.RB [ \-screenw\ pixels ]
-.RB [ \-screenh\ pixels ]
-.RB [ \-cache\ kbytes ]
-.RB [ \-bpp\ depth ]
+.RB [ \-dumpfile ]
+.RB [ \-dumpsub ]
+.RB [ \-screenw\ <pixels> ]
+.RB [ \-screenh\ <pixels> ]
+.RB [ \-cache\ <kbytes> ]
+.RB [ \-bpp\ <depth> ]
 .RB [ \-flip ]
 .RB [ \-playlist\ <filename> ]
 .RB [ \-slave ]
-.I - or file or device
+.RB [ \-loop\ <num> ]
+.RB [ \-mixer\ <device> ]
+.RB [ \-master\ yes/no ]
+.RB [ \-tv\ suboptions ]
+.RB [ \-dapsync ]
+.RB [ \-softsleep ]
+.I < - | file | URL | device >
 .PP
 .SH DESCRIPTION
 .I mplayer
-MPlayer is a movie player for LINUX (runs on many other Unices, and
-non-x86 CPUs, see section 6). It plays most MPEG, AVI and ASF/WMV files,
-supported by many native and Win32 DLL codecs. You can watch VideoCD,
-SVCD, DVD and even DivX movies too (and you don't need the avifile library
-at all!). The another big feature of mplayer is the wide range of
-supported output drivers. It works with X11, Xv, DGA, OpenGL, SVGAlib,
-fbdev, AAlib, but you can use SDL (and this way all drivers of SDL) and
-some lowlevel card-specific drivers (for Matrox, 3Dfx and Radeon) too!
-Most of them supports software or hardware scaling, so you can enjoy
-movies in fullscreen. And what about the nice big antialiased shaded
-subtitles (7 supported types!!!) with european/ISO 8859-1,2 (hungarian,
-english, czech, etc), cyrillic, korean fonts, and OSD?
+MPlayer is a movie player for LINUX (runs on many other Unices, and non-x86
+CPUs, see section 6). It plays most MPEG, AVI and ASF/WMV files, supported by
+many native and Win32 DLL codecs. You can watch VideoCD, SVCD, DVD, and even
+DivX movies too (and you don't need the avifile library at all!).
+
+Another big feature of mplayer is the wide range of supported output drivers :
+X11, Xv, DGA, OpenGL, SVGAlib, fbdev, AAlib, DirectFB, SDL (and all the drivers
+it supports), and some lowlevel card-specific drivers (for Matrox, 3Dfx and
+Radeon) too! Most of them supports software or hardware scaling, so you can
+enjoy movies in fullscreen.
+
+Several subtitles types are supported (curently 9 !) and the fonts are
+rendered with nice big antialiased shaded fonts ! Of course there is support
+for european/ISO 8859-1,2 (hungarian, english, czech, etc), cyrillic, korean
+fonts.
 .LP
-.SH "GENERAL OPTIONS"
-.TP
-.I NOTE
-Every "flag" option has "noflag" pair, e.g. -fs opposite is -nofs
+.SH "GUI OPTIONS"
+.I NOTE:
+The GUI code has to be compiled in *explicitly*, for details see the
+documentation.
 .TP
 .B \-gui
-start MPlayer with the GUI mode. You have to compile it in, for details
+start MPlayer in GUI mode.
+.TP
+.B \-skin <skin\ directory>
+load skin from this directory (WITHOUT path name!). For example '-skin fittyfene' tries these :
+
+    /usr/local/share/mplayer/Skin/fittyfene
+    ~/.mplayer/Skin/fittyfene
+.LP
+.SH "DVD OPTIONS"
+.I NOTE:
+These options are valid only with DVD support compiled in. For details,
 see the documentation.
 .TP
 .B \-dvd\ titleid
 tell MPlayer which movies (marked with titleid) to play. For example
 sometimes '1' are trailers, and '2' is the real movie.
 .TP
-.B \-sid\ id
+.B \-sid\ <id>
 Turns on DVD subtitle displaying. Also, you MUST specify a number which
-corresponds to a DVD subtitle language (1-...). For the list of available
-subtitles, use with the -v switch and look at the output. (EXPERIMENTAL)
+corresponds to a DVD subtitle language (0-31). For the list of available
+subtitles, use with the -v switch and look at the output.
 .TP
-.B \-chapter\ chapterid
+.B \-chapter\ <chapter\ id>
 specify which chapter to start playing at. Examples can be found below.
 .TP
-.B \-dvdangle\ angleid
+.B \-dvdangle\ <angle\ id>
 some DVD discs contain scenes that can be viewed from multiple angles.
 Here you can tell MPlayer which angles to use. Examples can be found below.
 .TP
+.B \-alang\ <audio\ stream\ language>
+Used when playing DVD disks. Expects a two-letter country code(s) as
+parameter, and always tries to play back audio streams those language
+matches the given code. For example: -alang hu,en will always try to play
+hungarian or if it's non-existant then english audio streams if there are any.
+.TP
+.B \-slang\ <subtitle\ language>
+See the former, but this option needs a two-letter parameter, a country code.
+Like: -slang hu,en will always select hungarian or if it's non existant then
+english subtitles, if there are any. For the list of available subtitles, use
+with the -v switch and look at the output.
+.LP
+.SH "GENERAL OPTIONS"
+.TP
+.I NOTE
+Every "flag" option has "noflag" pair, e.g. -fs opposite is -nofs
+.TP
 .B \-vo\ <driver>[:<device>]
 select video output driver and optinaly device. "device" is valid with
 SDL and GGI too, it means sub-driver then (for example: -vo sdl:aalib).
@@ -144,7 +192,7 @@
 .I mplayer -ao help
 
 .TP
-.B \-vcd\ track
+.B \-vcd\ <track>
 play video cd track from device instead of plain file
 .TP
 .B \-nosound
@@ -166,35 +214,31 @@
 flip image (useful for example for old Indeo codecs). Supported only(?)
 by the 'sdl' and 'x11' outputs.
 .TP
-.B \-x\ x
-scale image to x width [if driver suppports!]
+.B \-x\ <x>
+scale image to x width (if driver suppports)
+.TP
+.B \-y\ <y>
+scale image to y height (if driver supports)
 .TP
-.B \-y\ y
-scale image to y height
+.B \-sws\ <software\ scaler\ type>
+this option sets the quality (and speed, respectively) of the software scaler,
+with the -zoom option. For example with x11 or other outputs which lack
+hardware acceleration. Possible settings are :
+
+    0 - fast bilinear (default)
+    1 - bilinear
+    2 - bicubic (best quality)
 .TP
-.B \-xy\ factor
+.B \-xy\ <factor>
 scale image by <factor>
 .TP
-.B \-pp\ quality
-apply postprocess filter on decoded image.
-You need a STRONG CPU in order to use this!
-The supported formats and settings are:
-
-        MPEG 1/2   0 (none), TODO
-        OpenDivX   0 (none), TODO
-        DivX4      0 (none), TODO
-        DivX       0 (none), TODO
-
-        -pp 0x20000 TODO
-
-.TP
-.B \-autoq\ quality
+.B \-autoq\ <quality>
 dynamically changes the level of postprocess, depending on spare CPU
 time available. Uses the same value ranges as -pp . The number you
 specify will be the maximum level used. Usually you can use some big
 number. You don't have to (and don't) use together with -pp !
 .TP
-.B \-ffactor\ number
+.B \-ffactor\ <number>
 resample alphamap of the font. Can be:
 
         0    plain white fonts
@@ -202,26 +246,26 @@
         1    narrow black outline
         10   bold black outline
 .TP
-.B \-sub\ file
+.B \-sub\ <subtitle\ file>
 use/display this subtitle file
 .TP
-.B \-subfps\ rate
-specify frame/sec rate of subtitle file
+.B \-subfps\ <rate>
+specify frame/sec rate of subtitle file (float number)
 (ONLY for frame-based SUB files, i.e. NOT MicroDVD format!)
-(default: the same as the movie)
+(default: the same fps as the movie)
 .TP
-.B \-subdelay\ sec
+.B \-subdelay\ <sec>
 delays subtitles by <sec> seconds. Can be negative.
 .TP
-.B \-osdlevel\ level
+.B \-osdlevel\ <level>
 specifies which mode the OSD should start in (0 : none, 1 : seek, 2: seek+timer)
 (default = 2)
 .TP
-.B \-lircconf\ configfile
+.B \-lircconf\ <config\ file>
 specifies a configfile for LIRC (see http://www.lirc.org) if you don't like the default ~/.lircrc
 .TP
 .B \-v
-enable verbose output (more -v means more verbose)
+enable verbose output (more -v means more verbosity)
 .TP
 .B \-quiet
 display less output, status messages.
@@ -229,22 +273,15 @@
 .B \-benchmark
 used in combination with -nosound and -vo null for benchmarking.
 .TP
-.B \-skin skin directory
-load skin from this directory (WITHOUT path name!). For example '-skin fittyfene' tries these :
-
-    /usr/local/share/mplayer/Skin/fittyfene
-    ~/.mplayer/Skin/fittyfene
-.TP
-.B \-aspect ratio
+.B \-aspect <ratio>
 set aspect ratio of movies. It's autodetected on MPEG files, and can't be
 autodetected on AVI files. Examples:
 
     -aspect 4:3  or -aspect 1.3333
     -aspect 16:9 or -aspect 1.7777
 
-(has -noaspect pair)
 .TP
-.B \-monitoraspect ratio
+.B \-monitoraspect <ratio>
 set aspect ratio of your screen. Examples:
 
     -monitoraspect 4:3  or 1.3333
@@ -254,13 +291,27 @@
 .B \-playlist <file>
 play files according to this filelist (1 file/row).
 .TP
-.B \-slave
-This option switches on slave mode. This is intended for use
-of MPlayer as a backend to other programs. Instead of intercepting keyboard
-events, MPlayer will read simplistic command lines from its stdin.
-See section
-.B SLAVE MODE PROTOCOL
-for the syntax.
+.B \-ss\ <time>
+seek to given time position. For example :
+
+    -ss 56         seeks to 56 seconds
+    -ss 01:10:00   seeks to 1 hour 10 min
+
+.TP
+.B \-loop\ <num>
+loops movie playback <num> times. 0 means forever.
+.TP
+.B \-mixer\ <device>
+this option will tell MPlayer to use a different device for mixing than
+/dev/mixer.
+.TP
+.B \-master\ yes/no
+Setting this option to "yes" will instruct MPlayer to change the MASTER
+mixer channel when setting the volume, and "no" means the PCM channel.
+.TP
+.B \-tv\ suboptions
+this option enables the TV grabbing feature of MPlayer. For complete
+documentation, please see documentation.html chapter 2.5
 .IP
 .SH "ADVANCED OPTIONS"
 .TP
@@ -278,7 +329,7 @@
     -vc ffmpeg12   use libavcodec's MPEG1/2 codec
     -vc divx4      use ProjectMayo's DivX codec
 
-See -vc help for FULL list !
+See '-vc help' for FULL list !
 .TP
 .B \-ac <name>
 force usage of a specific audio codec, according to its name in codecs.conf,
@@ -292,7 +343,7 @@
     -ac vorbis     use libvorbis
     -ac ffmp3      use ffmpeg's MP3 decoder (SLOW)
 
-See -ac help for FULL list !
+See '-ac help' for FULL list !
 .TP
 .B \-vfm <1-12>
 force usage of a specific codec FAMILY, and FALLBACK to default if failed.
@@ -309,7 +360,8 @@
 
 See -vc help for FULL list !
 
-NOTE : if libdivxdecore support was compiled in, then type 3 and 7 now contains
+.I NOTE:
+if libdivxdecore support was compiled in, then type 3 and 7 now contains
 just the same DivX4 codec, but different APIs to reach it. For difference
 between them and when to use which, check the DivX4 section in the
 documentation.
@@ -317,8 +369,7 @@
 .B \-afm <1-12>
 force usage of a specific audio format. For example:
 
-    -afm 1         use libmp3 (mp2/mp3,
-                   but not mp1)
+    -afm 1         use libmp3 (mp2/mp3, but not mp1)
     -afm 2         suppose raw PCM audio
     -afm 3         use libac3
     -afm 4         use a matching Win32 codec
@@ -328,43 +379,125 @@
 
 See -ac help for FULL list !
 .TP
-.B \-sb\ position
+.B \-sb\ <byte\ position>
 seek to byte position
 .TP
-.B \-ss\ time
-seek to given time position. For example :
-
-    -ss 56
-    -ss 01:10:00
-
-.TP
-.B \-bpp\ depth
+.B \-bpp\ <depth>
 use different color depth than autodetect. Not all -vo drivers support
 it (fbdev, dga2, svga, vesa).
 .TP
-.B \-abs\ bytes
+.B \-pp\ <quality>
+apply postprocess filter on decoded image.
+Postprocessing effect depends on the codec and works only for MPEG, OpenDivX,
+DivX4, DivX. Quality is an hexadecimal number built as below:
+
+0x 00 TX hv YZ
+      ^^ ^^ ^^
+      ||  | ||
+      ||  | |\- postprocessing flag for luminance:
+      ||  | |   1/2: v/h deblock  4: dering
+      ||  | |   8: auto contrast/brightness correction
+      ||  | |
+      ||  | \-- postproc flags for color:
+      ||  |     1/2: v/h deblock  4: dering
+      ||  |
+      ||  \---- experimental deblocking filters:
+      ||        11: X's filter 22: x1 filter
+      ||
+      |\------- deinterlacing modes
+      |         1: linear interpolation  2: linear blend
+      |         4: cubic interpolation   8: median
+      |
+      \-------- temporal denoise filter: 1 enabled
+	
+.I HINT:
+0x2007f or 0x7f are known to give good results.
+.I NOTE:
+0x20000 (deinterlacing) may be required for DVD playback 
+.TP
+.B \-npp\ <options> (EXPERIMENTAL)
+This option allows to give more litterate options for postprocessing, and is
+another way of calling it (not with -pp).
+
+.I EXAMPLE:
+    '-pp 0x2007f' <=> '-npp hb,vb,dr,al,lb'
+    '-pp 0x7f'    <=> '-npp hb,vb,dr,al'
+
+The options for -npp are a coma separated list of the keywords below:
+    de or default        : hdeblock:a,vdeblock:a,
+                           dering:a,autolevels,tmpnoise:a:150:200:400 (0xTODO)
+    fa or fast           : x1hdeblock:a,x1vdeblock:a,
+                           dering:a,autolevels,tmpnoise:a:150:200:400 (0xTODO)
+    hb or hdeblock       : horizontal deblocking filter (0xTODO)
+    vb or vdeblock       : vertical deblocking filter (0xTODO)
+    hr or rkhdeblock     : rk horizontal deblock filter (0xTODO)
+    vr or rkvdeblock     : rk vertical deblock filter (0xTODO)
+    h1 or x1hdeblock     : x1 horizontal deblock filter (0xTODO)
+    v1 or x1vdeblock     : y1 horizontal deblock filter (0xTODO)
+    dr or dering         : TODO
+    al or autolevels     : brightness/contrast correction (0xTODO)
+    lb or linblenddeint  : linear blend deinterlacing (0x20000)
+    li or linipoldeint   : linear interpolation deinterlacing (0x10000)
+    ci or cubicipoldeint : cubic interpolation deinterlacing (0x40000)
+    md or mediandeint    : median deinterlacing (0x80000)
+    tn or tmpnoise       : temporal denoise filter (0x100000)
+
+These keywords accept a '-' prefix to disable the option.
+
+.I EXAMPLE:
+    '-npp de,-al' means 'default filters without brightness/contrast correction'
+
+A postfix letter, separated by ':' may be appended to the option to indicate
+its scope:
+    a : automatically switches the filter off if the cpu is too slow
+    c : do chrominance filtering too
+    y : do not do chrominance filtering (that is only luminance filtering)
+
+Each filter defaults to 'c' (chrominance).
+
+.I EXAMPLE:
+    '-npp de,tn:1:2:3' means 'enable default filters & temporal denoiser'
+    '-npp hb:y,vb:a -autoq 6' means 'deblock horizontal only luminance, and
+    automatically switch vertical deblocking on/off depending on available 
+    cpu time'
+
+.I HINT:
+    the following values are known to give good results:
+    -npp default -autoq 6 and -npp tn:150:200:400 for the denoiser
+
+.TP
+.B \-slave
+This option switches on slave mode. This is intended for use
+of MPlayer as a backend to other programs. Instead of intercepting keyboard
+events, MPlayer will read simplistic command lines from its stdin.
+See section
+.B SLAVE MODE PROTOCOL
+for the syntax.
+.TP
+.B \-abs\ <bytes>
 sound card audio buffer size (in bytes, default: measuring)
 .TP
-.B \-delay\ secs
+.B \-delay\ <secs>
 audio delay in seconds (may be +/- float value)
 .TP
 .B \-nobps
 don't use avg. byte/sec value for A-V sync (AVI)
 .TP
-.B \-aid\ id
+.B \-aid\ <id>
 select audio channel [MPG: 0-31 AVI: 1-99 ASF: 0-127 VOB: 128-...]
 .TP
-.B \-vid\ id
+.B \-vid\ <id>
 select video channel [MPG: 0-15  AVI:  -- ]
 .TP
-.B \-fps\ value
-force frame rate (if value is wrong in the header)
+.B \-fps\ <value>
+force frame rate (if value is wrong in the header) (float number)
 .TP
-.B \-mc\ seconds/5frame
+.B \-mc\ <seconds/5frame>
 maximum sync correction per 5 frames (in seconds)
 .TP
 .B \-ni
-force usage of non-interleaved AVI parser
+force usage of non-interleaved AVI parser (fixes playing
+of some bad AVI files)
 .TP
 .B \-include configfile
 specify config file to be parsed after the default
@@ -385,11 +518,11 @@
 .B \-nodshow
 disables usage of DirectShow video codecs
 .TP
-.B \-noxv
-disable XVideo hardware acceleration (with SDL only!)
+.B \-noxv (SDL only)
+disable XVideo hardware acceleration
 .TP
-.B \-forcexv
-force using XVideo (SDL!)
+.B \-forcexv (SDL only)
+force using XVideo
 .TP
 .B \-dumpaudio
 writes audio stream of the file to ./stream.dump (mostly usable
@@ -407,12 +540,9 @@
 frame dropping : decode all frames, video may skip
 .TP
 .B \-nodouble
-disable doublebuffering (default). Currently this is only honoured by the Xv and the DGA driver.
+disables doublebuffering.
 With the DGA driver this also disables OSD support but yields some speed gain.
 .TP
-.B \-double
-enable doublebuffering. Currently this is only honoured by the Xv and the DGA driver.
-.TP
 .B \-dvdkey key
 key to decrypt stream encrypted with CSS. For example : -dvdkey F169072699
 (this is NOT for DVD playing! For DVD use the -dvd option!)
@@ -433,16 +563,20 @@
 
 Currently this option is only honoured for AC3 audio.
 .TP
-.B \-srate Hz
+.B \-srate <Hz>
 specifies Hz to playback audio on. Has effect on playback speed!
 .TP
-.B \-config configfile
+.B \-config <config\ file>
 specifies where to search for config file
 .TP
-.B \-display name
+.B \-display <name>
 specify the hostname and display number of the X server you want
 to display on. For example : -display xtest.localdomain:0
 .TP
+.B \-wid\ <window\ id>
+This tells MPlayer to use a X11 window, which is useful to embed MPlayer in a
+browser (with the plugger extension for instance)
+.IP
 .B \-unicode
 tells MPlayer to handle the subtitle file as UNICODE.
 Contrary: -nounicode
@@ -465,21 +599,26 @@
 .B \-frames\ number
 MPlayer plays <number> frames, then quits.
 .TP
-.B \-fb\ device
+.B \-fb\ <device> (FBdev or DirectFB only)
 Specifies the framebuffer device to use. By default it uses /dev/fb0 .
-Only valid for the fbdev driver.
 .TP
-.B \-fbmode\ modename
+.B \-fbmode\ <modename> (FBdev only)
 Change videomode to the one that is labelled as <modename> in /etc/fb.modes .
-Only valid for the fbdev driver.
 .TP
 .I NOTE
 VESA framebuffer doesn't support mode changing.
 .TP
-.B \-fbmodeconfig\ filename
+.B \-fbmodeconfig\ <filename> (FBdev only)
 Use this config file instead of the default /etc/fb.modes .
 Only valid for the fbdev driver.
 .TP
+.B \-monitor_hfreq <horizontal frequency range>  (FBdev only)
+.TP
+.B \-monitor_vfreq <vertical frequency range>  (FBdev only)
+.TP
+.B \-monitor_dotclock <dotclock\ (or\ pixelclock) range>  (FBdev only)
+Look into etc/example.conf for further information and in DOC/video.html.
+.TP
 .B \-subcp\ codepage
 If your system supports iconv(3), you can use this option to
 specify codepage of the subtitle. Examples:
@@ -492,18 +631,18 @@
 Convert the given subtitle (specified with the -sub switch) to MPlayer's
 subtitle format, MPsub. Dumps a dump.mpsub file to current directory.
 .TP
-.B \-screenw\ pixels
+.B \-screenw\ <pixels>
 If you use an output driver which can't know the resolution of the screen
 (mga/fbdev/x11 and/or TVout) this is where you can specify the horizontal
 resolution.
 .TP
-.B \-screenh\ pixels
+.B \-screenh\ <pixels>
 If you use an output driver which can't know the resolution of the screen
 (mga/fbdev/x11 and/or TVout) this is where you can specify the vertical
 resolution.
 .TP
-.B \-cache\ kbytes
-This option specifies how much memory to use when precaching a file/URL .
+.B \-cache\ <kbytes>
+This option specifies how much memory to use when precaching a file/URL.
 Especially useful on slow media. Default is off.
 .IP
 .SH "ALPHA/BETA CODE"
@@ -513,19 +652,6 @@
 work! If you don't know what are these, you DON'T need these! In either case,
 double-check the documentation !
 .TP
-.B \-br\ rate
-used with '-vo odivx' .
-Specifies the bitrate to encode OpenDivx at
-(in bits! e.g: 780000).
-.TP
-.I NOTE
-You CAN'T encode sound, only video right now! Don't ask for it,
-it's on the TODO list.
-.TP
-.B \-encode\ file
-used with '-vo odivx' .
-Specifies the output OpenDivX file. Won't overwrite.
-.TP
 .B \-dumpvideo
 dump video stream to ./stream.dump (only with MPEG-PS) (not very usable)
 .IP
@@ -578,7 +704,7 @@
 
 skip <NUM>      skip NUM seconds (may be negative)
 
-quit            exit mplayer
+quit            exit MPlayer
 
 .IP
 .SH FILES AND DIRECTORIES
@@ -631,7 +757,7 @@
 Check documentation !
 
 MPlayer is (C) 2000-2001
-.I Arpad Gereoffy <arpi@thot.banki.hu>
+.I Arpad Gereoffy <sendmail@to.mplayer-users>
 
 This manpage is written and maintained by
 .I Gabucino .
--- a/DOCS/Polish/sound.html	Sat Dec 29 16:43:24 2001 +0000
+++ b/DOCS/Polish/sound.html	Sat Dec 29 18:46:10 2001 +0000
@@ -21,7 +21,7 @@
 
 </TABLE>
 
-<P>The fact is, Linux soundcard drivers are usually shit, and always as
+<P>The fact is, Linux soundcard drivers are usually bad, and always as
 incompatible as they can be. It MAY take a while to find your optimal settings.</P>
 <P><UL>
 <LI>if you have OSS as driver, first try with <I>-ao oss</I> (this is the default).
@@ -123,5 +123,21 @@
 <LI>Please tell us how MPlayer and your soundcard(s) worked together!
 </UL></P>
 
+
+<P><B><A NAME=2.3.2.2>2.3.2.2. Audio plugins</B></P>
+
+<P><B><A NAME=2.3.2.2.1>2.3.2.2.1. Up/Downsampling</B></P>
+
+<P><B>MPlayer</B> fully supports up/downsampling of audio stream.
+It is not autodetected, so you have to specify it explicitly even when
+for example you have a max 44.1Khz capable soundcard, and the audio
+is 48Khz. Also, this functionality is currently unimplemented in
+<B>MEncoder</B>.</P>
+
+<P>Usage :<BR>
+&nbsp;&nbsp;<CODE>mplayer media.avi -aop list=resample:fout=&lt;required
+  frequency in Hz, like 44100&gt;</CODE></P>
+
+
 </BODY>
 </HTML>
--- a/DOCS/Polish/video.html	Sat Dec 29 16:43:24 2001 +0000
+++ b/DOCS/Polish/video.html	Sat Dec 29 18:46:10 2001 +0000
@@ -24,6 +24,9 @@
 <LI>Matrox cards with X/DRI >=4.0.3
 <LI>Radeon with X/DRI CVS</UL></TD><TR>
 <TD></TD><TD VALIGN=top><FONT face="Verdana, Arial, Helvetica, sans-serif"
+  size=2><A HREF=#2.3.1.10>gl2</A></TD><TD></TD><TD><FONT face="Verdana, Arial,
+  Helvetica, sans-serif" size=2>OpenGL renderer, multiple textures version</TD><TR>
+<TD></TD><TD VALIGN=top><FONT face="Verdana, Arial, Helvetica, sans-serif"
   size=2><A HREF=#2.3.1.3>dga</A></TD><TD></TD><TD><FONT face="Verdana, Arial,
   Helvetica, sans-serif" size=2>X11 DGA extension</TD><TR>
 <TD></TD><TD VALIGN=top><FONT face="Verdana, Arial, Helvetica, sans-serif"
@@ -47,6 +50,9 @@
 <TD></TD><TD VALIGN=top><FONT face="Verdana, Arial, Helvetica, sans-serif"
   size=2><a href=#2.3.1.12>vesa</a></TD><TD></TD><TD><FONT face="Verdana, Arial,
   Helvetica, sans-serif" size=2>Output to VESA BIOS.</TD><TR>
+<TD></TD><TD VALIGN=top><FONT face="Verdana, Arial, Helvetica, sans-serif"
+  size=2>directfb</TD><TD></TD><TD><FONT face="Verdana, Arial,
+  Helvetica, sans-serif" size=2>Direct Framebuffer Device</TD><TR>
 
 <TD COLSPAN=4><P><B><FONT face="Verdana, Arial, Helvetica, sans-serif"
   size=2>Card specific:</B></P></TD><TR>
@@ -268,6 +274,12 @@
 Drivers provided by <A HREF="mailto:tomee@cpi.pl">Tomek Jarzynka</A>.
 </P>
 
+<P><B><A NAME=2.3.1.2.6>2.3.1.2.6. Trident cards</A></B></P>
+
+<P>If you want to use xv with a trident card, provided that it doesn't
+work with 4.1.0, try the latest cvs of Xfree or wait for Xfree 4.2.0.
+The latest cvs adds support for fullscreen xv support with the
+Cyberblade XP card.</P>
 
 <P><B><A NAME=2.3.1.3>2.3.1.3. DGA</A></B></P>
 
@@ -592,11 +604,14 @@
 
 <P><CODE>&nbsp;&nbsp;&nbsp;&nbsp;insmod mga_vid.o mga_ram_size=16</CODE></P>
 
-<P>To make it load/unload automatically when needed, insert the following line
+<P>To make it load/unload automatically when needed, first insert the following line
 at the end of /etc/modules.conf:</P>
 
 <P><CODE>&nbsp;&nbsp;&nbsp;&nbsp;alias char-major-178 mga_vid</CODE></P>
 
+<P>Then copy the <CODE>mga_vid.o</CODE> module to the appropriate place under
+  <CODE>/lib/modules/&lt;kernel version&gt;/somewhere</CODE>.</P>
+
 <P>Then run</P>
 
 <P><CODE>&nbsp;&nbsp;&nbsp;&nbsp;depmod -a</CODE></P>