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

3 files changed, 10 insertions, 14 deletions

diff --git a/DOCS/xml/en/encoding-guide.xml b/DOCS/xml/en/encoding-guide.xml
index 8f7460a02e..2072cdfc6f 100644
--- a/DOCS/xml/en/encoding-guide.xml
+++ b/DOCS/xml/en/encoding-guide.xml
@@ -2158,7 +2158,7 @@ corresponding lines for each field (this has drawbacks - see method 3).
   these filters available to choose from, each with its own advantages
   and disadvantages. Consult <option>mplayer -pphelp</option> and
   <option>mplayer -vf help</option> to see what is available
-  (grep for "deint"), read Michael's Niedermayer
+  (grep for "deint"), read Michael Niedermayer's
   <ulink url="http://guru.multimedia.cx/deinterlacing-filters/">Deinterlacing filters comparison</ulink>,
   and search the
   <ulink url="http://www.mplayerhq.hu/design7/mailing_lists.html">
@@ -2250,7 +2250,7 @@ mencoder dvd://1 -oac copy -vf pullup,softskip
   fields to form a complete frame. <option>filmdint</option> will
   deinterlace individual fields that it cannot match, however, whereas
   <option>pullup</option> will simply drop them. Also, the two filters
-  have separate detection code, and filmdint may tend to match fields a
+  have separate detection code, and <option>filmdint</option> may tend to match fields a
   bit less often. Which filter works better may depend on the input
   video and personal taste; feel free to experiment with fine-tuning
   the filters' options if you encounter problems with either one (see
diff --git a/DOCS/xml/en/ports.xml b/DOCS/xml/en/ports.xml
index 78ca89cd6c..0c8d23aebe 100644
--- a/DOCS/xml/en/ports.xml
+++ b/DOCS/xml/en/ports.xml
@@ -603,10 +603,8 @@ and needs a bit of manual setup. Download
 <ulink url="http://www.mplayerhq.hu/MPlayer/releases/win32/dhahelperwin/withmtrr/dhahelper.sys">dhahelper.sys (with MTRR support)</ulink>
 and copy it to the <filename class="directory">vidix/dhahelperwin</filename>
 directory in your <application>MPlayer</application> source tree.
-Open a console and change to that directory. Then type
-<screen>gcc -o dhasetup.exe dhasetup.c</screen>
-and execute
-<screen>dhasetup.exe install</screen>
+Open a console and type
+<screen>make install-dhahelperwin</screen>
 as Administrator. After that you will have to reboot.
 </para>
 
diff --git a/DOCS/xml/en/video.xml b/DOCS/xml/en/video.xml
index 2c1d3b8c28..a60a894a72 100644
--- a/DOCS/xml/en/video.xml
+++ b/DOCS/xml/en/video.xml
@@ -854,15 +854,14 @@ For a Linux 2.6.x version of this driver check out
 <procedure>
 <title>Installation:</title>
 <step><para>
-  To use it, you first have to compile <filename>mga_vid.o</filename>:
+  To use it, you first have to compile <filename>drivers/mga_vid.o</filename>:
   <screen>
-cd drivers
-make<!--
+make drivers<!--
 --></screen>
 </para></step>
 <step><para>
   Then run (as <systemitem class="username">root</systemitem>)
-  <screen>make install</screen>
+  <screen>make install-drivers</screen>
   which should install the module and create the device node for you.
   Load the driver with
   <screen>insmod mga_vid.o</screen>
@@ -941,14 +940,13 @@ the following instructions.
 <procedure>
 <title>Installing the tdfx_vid.o kernel module:</title>
 <step><para>
-  Compile <filename>tdfx_vid.o</filename>:
+  Compile <filename>drivers/tdfx_vid.o</filename>:
   <screen>
-cd drivers
-make</screen>
+make drivers</screen>
 </para></step>
 <step><para>
   Then run (as <systemitem class="username">root</systemitem>)
-  <screen>make install</screen>
+  <screen>make install-drivers</screen>
   which should install the module and create the device node for you.
   Load the driver with
   <screen>insmod tdfx_vid.o</screen>