Merge svn changes up to r27649

Conflicts:
	Makefile
	configure
	libvo/x11_common.c

4 files changed, 85 insertions, 22 deletions

diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index 615f33231a..972e3bbc90 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -905,7 +905,7 @@ to ensure it does not cause security problems (e.g.\& make sure to use full
 paths if "." is in your path like on Windows).
 .sp 1
 This can be "misused" to disable screensavers that do not support the proper
-X API.
+X API (also see \-stop\-xscreensaver).
 If you think this is too complicated, ask the author of the screensaver
 program to support the proper X APIs.
 .sp 1
@@ -3217,6 +3217,8 @@ do not know the screen resolution like fbdev, x11 and TV-out.
 .TP
 .B \-stop\-xscreensaver (X11 only)
 Turns off xscreensaver at startup and turns it on again on exit.
+If your screensaver supports neither the XSS nor XResetScreenSaver
+API please use \-heartbeat\-cmd instead.
 .
 .TP
 .B "\-vm \ \ \ "
@@ -3915,7 +3917,7 @@ Explicitly choose the Matrox device name to use (default: /dev/\:mga_vid).
 .PD 1
 .
 .TP
-.B s3fb (Linux only) (see also \-vf yuv2 and \-dr)
+.B s3fb (Linux only) (also see \-vf yuv2 and \-dr)
 S3 Virge specific video output driver.
 This driver supports the card's YUV conversion and scaling, double
 buffering and direct rendering features.
@@ -4477,8 +4479,21 @@ This is not a bug, but a side effect of not decoding at full resolution.
 If <w> is specified lowres decoding will be used only if the width of the
 video is major than or equal to <w>.
 .RE
-.IPs "o\ \ \ \ "
-FIXME: undocumented
+.B o=<key>=<value>[,<key>=<value>[,...]]
+Pass AVOptions to libavcodec decoder
+Note, a patch to make the o= unneeded and pass all unknown options through
+the AVOption system is welcome.
+A full list of AVOptions can be found in FFmpeg manual.
+Note that some options may conflict with MEncoder options.
+.sp 1
+.RS
+.I EXAMPLE:
+.RE
+.RSs
+.PD 0
+.IPs o=debug=pict
+.PD 1
+.RE
 .IPs "sb=<number> (MPEG-2 only)"
 Skip the given number of macroblock rows at the bottom.
 .IPs "st=<number> (MPEG-2 only)"
@@ -7630,9 +7645,11 @@ Read the source for full details.
 .
 .TP
 .B o=<key>=<value>[,<key>=<value>[,...]]
-Pass AVOptions to libavcodec
+Pass AVOptions to libavcodec encoder
 Note, a patch to make the o= unneeded and pass all unknown options through
 the AVOption system is welcome.
+A full list of AVOptions can be found in FFmpeg manual.
+Note that some AVOptions may conflict with MEncoder options.
 .sp 1
 .RS
 .I EXAMPLE:
@@ -7889,7 +7906,7 @@ so quality may be low.
 motion estimation search range (default: 0 (unlimited))
 .
 .TP
-.B mbd=<0\-2> (see also *cmp, qpel)
+.B mbd=<0\-2> (also see *cmp, qpel)
 Macroblock decision algorithm (high quality mode), encode each macro
 block in all modes and choose the best.
 This is slow but results in better quality and file size.
@@ -9075,9 +9092,6 @@ FIXME: Document this.
 .B skip_threshold=<0\-1000000>
 FIXME: Document this.
 .
-.TP
-.B "o\ \ \ \ \ \ "
-FIXME: undocumented
 .
 .
 .SS nuv (\-nuvopts)
@@ -10473,8 +10487,21 @@ Maximum length in seconds to analyze the stream properties.
 Force a specific libavformat demuxer.
 .
 .TP
-.B "o\ \ \ \ \ \ "
-FIXME: undocumented
+.B o=<key>=<value>[,<key>=<value>[,...]]
+Pass AVOptions to libavformat demuxer
+Note, a patch to make the o= unneeded and pass all unknown options through
+the AVOption system is welcome.
+A full list of AVOptions can be found in FFmpeg manual.
+Note that some options may conflict with MPlayer/MEncoder options.
+.sp 1
+.RS
+.I EXAMPLE:
+.RE
+.RSs
+.PD 0
+.IPs o=ignidx
+.PD 1
+.RE
 .
 .TP
 .B probesize=<value>
@@ -10532,6 +10559,8 @@ MPEG-4 format
 MPEG-4 format with extra header flags required by Apple iPod firmware
 .IPs "dv\ \ \ "
 Sony Digital Video container
+.IPs "matroska\ \ \ "
+Matroska
 .RE
 .PD 1
 .TP
@@ -10541,8 +10570,21 @@ currently it is meaningful only for MPEG[12].
 Sometimes raising it is necessary in order to avoid "buffer underflows".
 .
 .TP
-.B "o\ \ \ \ \ \ "
-FIXME: undocumented
+.B o=<key>=<value>[,<key>=<value>[,...]]
+Pass AVOptions to libavformat muxer
+Note, a patch to make the o= unneeded and pass all unknown options through
+the AVOption system is welcome.
+A full list of AVOptions can be found in FFmpeg manual.
+Note that some options may conflict with MEncoder options.
+.sp 1
+.RS
+.I EXAMPLE:
+.RE
+.RSs
+.PD 0
+.IPs o=packetsize=100
+.PD 1
+.RE
 .
 .TP
 .B packetsize=<size>
diff --git a/DOCS/man/hu/mplayer.1 b/DOCS/man/hu/mplayer.1
index 965260bc21..7ede56e5c8 100644
--- a/DOCS/man/hu/mplayer.1
+++ b/DOCS/man/hu/mplayer.1
@@ -1,4 +1,4 @@
-.\" Synced with r27407
+.\" Synced with r27607
 .\" MPlayer (C) 2000-2008 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 "2008. 08. 06." "MPlayer Project" "A film lejátszó"
+.TH MPlayer 1 "2008. 09. 14." "MPlayer Project" "A film lejátszó"
 .
 .SH NÉV
 mplayer  \- film lejátszó
@@ -906,7 +906,7 @@ hogy ne okozzon biztonsági problémát (pl.\& győződj meg róla, hogy teljes elérés
 utakat használsz, ha a "." benne van az elérési utadban, mint Windows alatt).
 .sp 1
 Ezt "ki lehet használni" az olyan képernyővédő letiltásához, amely nem
-támogatja ehhez a megfelelő X API-kat.
+támogatja ehhez a megfelelő X API-kat (lásd még \-stop\-xscreensaver).
 Ha úgy gondolod, hogy ez túl komplikált, kérd meg a képernyővédő
 szerzőjét, hogy támogassa a szükséges X API-kat.
 .sp 1
@@ -3230,6 +3230,8 @@ ami nem tudja a képernyő felbontását, mint az fbdev, x11 és TV-out.
 .TP
 .B \-stop\-xscreensaver (csak X11)
 Kikapcsolja az xscreensaver-t a lejátszás indításakor, kilépéskor újraindítja.
+Ha a képernyő védőd sem az XSS, sem az XResetScreenSaver API-t nem támogatja,
+használd inkább a \-heartbeat\-cmd kapcsolót.
 .
 .TP
 .B "\-vm \ \ \ "
@@ -3474,8 +3476,9 @@ Nagyon gyors kimeneti videó vezérlő az olyan kártyákon, amik támogatják.
 .RSs
 .IPs <aleszköz>
 Explicit kiválasztja a használni kívánt VIDIX aleszközt.
-A használható aleszközök a cyberblade, mach64,
-mga_crtc2, mga, nvidia, pm2, pm3, radeon, rage128, sis és unichrome.
+A használható aleszközök a cyberblade, ivtv, mach64,
+mga_crtc2, mga, nvidia, pm2, pm3, radeon, rage128, s3, sh_veu,
+sis_vid és unichrome.
 .RE
 .PD 1
 .
@@ -7410,11 +7413,11 @@ A codec specifikus kódolási paramétereket a következő szintaxissal adhatod meg:
 .B \-<codec>opts <opció1[=érték1]:opció2[=érték2]:...>
 .
 .PP
-Ahol a <codec> lehet: lavc, xvidenc, lame, toolame, twolame,
+Ahol a <codec> lehet: lavc, xvidenc, mp3lame, toolame, twolame,
 nuv, xvfw, faac, x264enc, mpeg, lavf.
 .
 .
-s.SS lame (\-lameopts)
+s.SS mp3lame (\-lameopts)
 .
 .TP
 .B "help\ \ \ "
@@ -7648,6 +7651,21 @@ Nézd meg a forrást a részletekért.
 .PD 1
 .
 .TP
+.B o=<kulcs>=<érték>[,<kulcs>=<érték>[,...]]
+AVOption átadása a libavcodec-nek
+Emlékezz rá, hogy az o= kapcsolót feleslegessé tevő, az összes ismeretlen
+opciót a AVOption rendszernek átadó javítást szívesen fogadunk.
+.sp 1
+.RS
+.I PÉLDA:
+.RE
+.RSs
+.PD 0
+.IPs o=bt=100k
+.PD 1
+.RE
+.
+.TP
 .B acodec=<érték>
 audió codec (alapértelmezett: mp2)
 .PD 0
diff --git a/DOCS/tech/wishlist b/DOCS/tech/wishlist
index 37f256c338..c5fe84b932 100644
--- a/DOCS/tech/wishlist
+++ b/DOCS/tech/wishlist
@@ -23,6 +23,8 @@ Documentation:
 
  * document channels.conf syntax
 
+ * ability for multiple languages/locales in one binary
+
 Small improvements:
 
  * vo_mga should completely blank the screen like fbdev and tdfxfb
@@ -87,7 +89,7 @@ Filters:
 
  * xinerama video filter that splits movie to 2 screens (like zr)
 
- * mixing of multiple videos (picture in picture, ...)
+ * mixing of multiple videos (picture in picture, review shmem patch)
 
  * video watermark/logo filter (apply vf_overlay patch?)
 
diff --git a/DOCS/xml/en/mencoder.xml b/DOCS/xml/en/mencoder.xml
index b52ada1986..4646937345 100644
--- a/DOCS/xml/en/mencoder.xml
+++ b/DOCS/xml/en/mencoder.xml
@@ -326,7 +326,8 @@ The name comes from the fact that this method encodes the file
 <emphasis>twice</emphasis>.  The first encoding (dubbed pass) creates some
 temporary files (<filename>*.log</filename>) with a size of few megabytes, do
 not delete them yet (you can delete the AVI or rather just not create any video
-by redirecting it into <filename>/dev/null</filename>).
+by redirecting it into <filename>/dev/null</filename>
+or on Windows into <filename>NUL</filename>).
 In the second pass, the two 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