Merge svn changes up to r26680

Conflicts:

	Makefile
	configure
	osdep/timer-darwin.c

3 files changed, 18 insertions, 14 deletions

diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index 3dbd8b8946..b1493742f0 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -151,7 +151,7 @@ architectures, see the documentation).
 It plays most MPEG/\:VOB, AVI, ASF/\:WMA/\:WMV, RM, QT/\:MOV/\:MP4, Ogg/\:OGM,
 MKV, VIVO, FLI, NuppelVideo, yuv4mpeg, FILM and RoQ files, supported by many
 native and binary codecs.
-You can watch Video CD, SVCD, DVD, 3ivx, DivX 3/4/5 and even WMV movies,
+You can watch VCD, SVCD, DVD, 3ivx, DivX 3/4/5, WMV and even H.264 movies,
 too.
 .PP
 MPlayer supports a wide range of video and audio output drivers.
@@ -3746,8 +3746,10 @@ Disabling might increase speed.
 .
 .TP
 .B "gl2\ \ \ \ "
-OpenGL video output driver, second generation.
-Supports OSD and videos larger than the maximum texture size.
+Variant of the OpenGL video output driver.
+Supports videos larger than the maximum texture size but lacks many of the
+advanced features and optimizations of the gl driver and is unlikely to be
+extended further.
 .PD 0
 .RSs
 .IPs (no)glfinish
diff --git a/DOCS/man/it/mplayer.1 b/DOCS/man/it/mplayer.1
index 0b7ef6361d..16d33f1e7a 100644
--- a/DOCS/man/it/mplayer.1
+++ b/DOCS/man/it/mplayer.1
@@ -1,4 +1,4 @@
-.\" synced with r26460
+.\" synced with r26674
 .\" Encoding: iso-8859-1
 .\" MPlayer (C) 2000-2008 MPlayer Team
 .\" Questa pagina di manuale è stata fatta da Gabucino, Diego Biurrun,
@@ -156,8 +156,8 @@ architetture di CPU, controlla la documentazione).
 Visualizza la maggior parte dei file del tipo MPEG/\:VOB, AVI,
 ASF/\:WMA/\:WMV, RM, QT/\:MOV/\:MP4, Ogg/\:OGM, MKV, VIVO, FLI, NuppelVideo,
 yuv4mpeg, FILM e RoQ, supportato da molti codec nativi o binari.
-Puoi guardare Video CD, SVCD, DVD, 3ivx, DivX 3/4/5 ed addirittura film in
-formato WMV.
+Puoi guardare VCD, SVCD, DVD, 3ivx, DivX 3/4/5, WMV ed addirittura filmati
+con codifica H.264.
 .PP
 MPlayer supporta un'ampia gamma di driver di uscita video ed audio.
 Funziona con X11, XV, DGA, OpenGL, SVGAlib, fbdev, AAlib, libcaca, DirectFB,
@@ -3920,8 +3920,10 @@ Disabilitarlo può incrementare la velocità.
 .
 .TP
 .B "gl2\ \ \ \ "
-Driver di uscita video OpenGL, seconda generazione.
-Supporta OSD e video più grandi della dimensione massima della texture.
+Driver alternativo di uscita video OpenGL.
+Supporta video più grandi della dimensione massima della texture, ma manca di
+molte funzionalità avanzate e ottimizzazioni rispetto al driver gl e
+difficilmente verrà sviluppato ulteriormente.
 .PD 0
 .RSs
 .IPs (no)glfinish
diff --git a/DOCS/xml/en/codecs.xml b/DOCS/xml/en/codecs.xml
index f1a7bce4c3..6fed5cc4c6 100644
--- a/DOCS/xml/en/codecs.xml
+++ b/DOCS/xml/en/codecs.xml
@@ -192,8 +192,8 @@ default as it offers better speed.
 <para>
 <ulink url="http://developers.videolan.org/x264.html"><systemitem class="library">x264</systemitem></ulink>
 is a library for creating H.264 video streams.
-It is not 100% complete, but currently it has at least some kind
-of support for most of the H.264 features which impact quality.
+It is not 100% complete, but supports most of H.264's features which impact
+quality.
 There are also many advanced features in the H.264 specification
 which have nothing to do with video quality per se; many of these
 are not yet implemented in <systemitem class="library">x264</systemitem>.
@@ -303,17 +303,17 @@ H.264 decoding, you might keep an eye on
   and <systemitem class="library">x264</systemitem>?</title>
 
 <para>
-If you have the subversion client installed, the latest x264
+If you have the GIT client installed, the latest x264
 sources can be gotten with this command:
-<screen>svn co svn://svn.videolan.org/x264/trunk x264</screen>
+<screen>git clone git://git.videolan.org/x264.git</screen>
 <application>MPlayer</application> sources are updated whenever
 an <systemitem class="library">x264</systemitem> API change
 occurs, so it is always suggested to use
-<application>MPlayer</application> from Subversion as well.
+<application>MPlayer</application> from GIT as well.
 Perhaps this situation will change when and if an
 <systemitem class="library">x264</systemitem> "release" occurs.
 Meanwhile, <systemitem class="library">x264</systemitem> should
-be considered very unstable, in the sense that its programming
+be considered a bit unstable, in the sense that its programming
 interface is subject to change.
 </para>