Merge svn changes up to r26979

Most of the conflicts are trivial.

Conflicts:

	Makefile
	cfg-mplayer.h
	input/input.c
	libmenu/vf_menu.c
	libmpcodecs/dec_video.c
	libmpcodecs/vf_expand.c
	libmpcodecs/vf_vo.c
	libmpdemux/demux_mkv.c
	libmpdemux/demuxer.c
	libmpdemux/demuxer.h
	libvo/vo_directfb2.c
	libvo/vo_gl.c
	libvo/vo_winvidix.c
	libvo/vo_xv.c
	libvo/vo_xvidix.c
	libvo/vo_xvmc.c
	libvo/x11_common.c
	mplayer.c
	osdep/timer-linux.c
	stream/cache2.c

6 files changed, 16 insertions, 8 deletions

diff --git a/DOCS/tech/MAINTAINERS b/DOCS/tech/MAINTAINERS
index 65e5c2f76f..96e58a60b2 100644
--- a/DOCS/tech/MAINTAINERS
+++ b/DOCS/tech/MAINTAINERS
@@ -134,7 +134,7 @@ streams:
 
 codec support:
     * FFmpeg: Michael Niedermayer
-    * XviD: Ivan Kalvachev
+    * Xvid: Ivan Kalvachev
     * x264: Loren Merritt
     * musepack, speex: Reimar Döffinger
 
diff --git a/DOCS/tech/dvdnav-howto.txt b/DOCS/tech/dvdnav-howto.txt
index 005a85cd00..ef92110325 100644
--- a/DOCS/tech/dvdnav-howto.txt
+++ b/DOCS/tech/dvdnav-howto.txt
@@ -21,13 +21,14 @@ $ make install
 From within the MPlayer source tree run
 $ ./configure --disable-dvdread-internal
 followed by your preferred parameters.
+Be warned that you *MUST* disable MPlayer's internal copy of dvdread or something
+- most likely - won't work as expected (if at all).
 After configure is run it should say that support for dvdnav and dvdread was
 enabled. If not, investigate the dvdnav and dvdread sections in configure.log
 and try to understand what went wrong. If you can't solve the problem yourself
 post the two sections to mplayer-users.
 
-Notice: Animated menus are working, but still menus and still scenes are not
-yet supported. Also, audio and subtitle language selection by means of menus
-doesn't work yet. Nonetheless they can be switched as usual at any time during
+Notice: Audio and subtitle language selection by means of menus doesn't work yet.
+Nonetheless they can be switched as usual at any time during
 playback by pressing '#' and 'j' (or the keys you chose to override those two
 bindings).
diff --git a/DOCS/tech/encoding-guide.txt b/DOCS/tech/encoding-guide.txt
index 5073c7c89b..0393bcbb5f 100644
--- a/DOCS/tech/encoding-guide.txt
+++ b/DOCS/tech/encoding-guide.txt
@@ -122,7 +122,7 @@ during the first pass. However, sometimes it is beneficial to watch
 the first-pass file before beginning the second pass to make sure
 nothing went wrong in the encoding.
 
-Next, an example using XviD instead of libavcodec:
+Next, an example using Xvid instead of libavcodec:
 
   Encoding from an existing AVI file
   500 kbit/sec MPEG-4 video
diff --git a/DOCS/tech/encoding-tips.txt b/DOCS/tech/encoding-tips.txt
index 9c9e5ddd87..9096f1f84e 100644
--- a/DOCS/tech/encoding-tips.txt
+++ b/DOCS/tech/encoding-tips.txt
@@ -304,7 +304,7 @@ This way it apeared that the minimum bits per block is ~40, very
 good results are with ~50, and everything above 60 is a waste of bandwidth.
 And what's actually funny is that it was independent of codec used. The
 results were exactly the same, whether I used DIV3 (with tricky nandub's
-magick), ffmpeg odivx, DivX5 on Windows or XviD.
+magick), ffmpeg odivx, DivX5 on Windows or Xvid.
 
 Surprisingly there is one advantage of using nandub-DIV3 for bitrate
 starved encoding: ringing almost never apears this way.
diff --git a/DOCS/tech/slave.txt b/DOCS/tech/slave.txt
index 5664ef1066..080f7fa880 100644
--- a/DOCS/tech/slave.txt
+++ b/DOCS/tech/slave.txt
@@ -267,6 +267,9 @@ step_property <property> [value] [direction]
     not given or zero. The direction is reversed if direction is less
     than zero.
 
+stop
+    Stop playback.
+
 sub_alignment [value]
     Toggle/set subtitle alignment.
         0 top alignment
diff --git a/DOCS/tech/svn-howto.txt b/DOCS/tech/svn-howto.txt
index b31f46367a..9fdaa7853f 100644
--- a/DOCS/tech/svn-howto.txt
+++ b/DOCS/tech/svn-howto.txt
@@ -36,8 +36,8 @@ I. BASICS:
 
 0. Get Subversion:
 
-  The MPlayer project server runs Subversion 1.2.3. For optimal compatibility
-  you should use version 1.2.3 or later.
+  The MPlayer project server runs Subversion 1.4. For optimal compatibility
+  you should use version 1.4 or later.
 
 
 1. Checking out the source tree:
@@ -305,6 +305,10 @@ II. POLICY / RULES:
      - verbosity changes from default (info) level
      - changes to "historical" parts of docs and web pages
      - use of internal or external libraries
+     - reverting commits from other developers
+     - mixing functional and cosmetic changes
+     - making the spelling of words consistent without actually correcting
+       any spelling errors.
 
 
 13. Try to keep important discussions and requests (also) on the mplayer-dev-eng