Merge svn changes up to r29277

3 files changed, 11 insertions, 14 deletions

diff --git a/DOCS/tech/MAINTAINERS b/DOCS/tech/MAINTAINERS
index 68b0768bc4..680906e4e2 100644
--- a/DOCS/tech/MAINTAINERS
+++ b/DOCS/tech/MAINTAINERS
@@ -43,9 +43,7 @@ Man page translations:
     * Italian: Daniele Forghieri
     * Polish: Waclaw Schiller
     * Spanish: Reynaldo H. Verdejo Pinochet (outdated)
-    * Chinese: unmaintained, outdated
-    * Swedish: unmaintained, outdated, incomplete
-    * Russian: Vladimir Voroshilov (incomplete)
+    * Russian: Vladimir Voroshilov
 
 Documentation translations:
     * Czech: Jiri Heryan
@@ -55,8 +53,8 @@ Documentation translations:
     * Italian: Paolo Tresoldi
     * Polish: Waclaw Schiller
     * Spanish: Reynaldo H. Verdejo Pinochet (outdated)
-    * Chinese (simplified): unmaintained, outdated, still HTML
-    * Italian: unmaintained, outdated, still HTML
+    * Chinese (simplified): unmaintained, outdated
+    * Italian: unmaintained, outdated
     * Russian: Vladimir Voroshilov
 
 Platforms/ports:
@@ -68,8 +66,8 @@ Platforms/ports:
     * OpenBSD: Björn Sandell
     * Solaris: Derek Lewis
     * Win32/Cygwin/MinGW: Sascha Sommer, Joey Parrish
-    * MPlayer OS X frontend: Nicolas Plourde
-    * Mac OS X: Ulion
+    * MPlayer OS X frontend: Nicolas Plourde, Adrian Stutz
+    * Mac OS X: None
     * AIX: Derek Lewis
 
 MPlayer code:
@@ -158,6 +156,7 @@ libvo drivers:
     * vo_aa.c - Alban Bedel
     * vo_caca.c - Howell Tam (Pigeon)
     * vo_bl.c - Rik Snel
+    * vo_corevideo.m - Adrian Stutz
     * vo_cvidix.c - Sascha Sommer
     * vo_dga.c - None
     * vo_dfbmga.c - Ville Syrjälä
@@ -174,7 +173,6 @@ libvo drivers:
     * vo_gl2.c - Reimar Döffinger
     * vo_ivtv.c - Benjamin Zores
     * vo_jpeg.c - Ivo van Poorten
-    * vo_macosx.m - Ulion
     * vo_md5sum.c - Ivo van Poorten
     * vo_mga.c - Attila Kinali
     * vo_mpegpes.c - None
@@ -206,12 +204,12 @@ libao2 drivers:
     * ao_alsa5.c - None
     * ao_alsa.c - Clemens Ladisch
     * ao_arts.c - None
+    * ao_coreaudio.c - None
     * ao_dsound.c - None
     * ao_dxr2.c - None
     * ao_esd.c - None
     * ao_ivtv.c - Benjamin Zores
     * ao_jack.c - Reimar Döffinger
-    * ao_macosx.c - Ulion
     * ao_mpegpes.c - None
     * ao_nas.c - Tobias Diedrich
     * ao_null.c - None
diff --git a/DOCS/tech/libao2.txt b/DOCS/tech/libao2.txt
index e2a530050d..ba8317e056 100644
--- a/DOCS/tech/libao2.txt
+++ b/DOCS/tech/libao2.txt
@@ -12,16 +12,16 @@ static int init(int rate,int channels,int format,int flags);
   Sample format: usually AFMT_S16_LE or AFMT_U8, for more definitions see
   dec_audio.c and linux/soundcards.h files!
 
-static void uninit();
+static void uninit(void);
   Guess what.
   Ok I help: closes the device, not (yet) called when exit.
 
-static void reset();
+static void reset(void);
   Resets device. To be exact, it's for deleting buffers' contents,
   so after reset() the previously received stuff won't be output.
   (called if pause or seek)
 
-static int get_space();
+static int get_space(void);
   Returns how many bytes can be written into the audio buffer without
   blocking (making caller process wait). MPlayer occasionally checks the
   remaining space and tries to fill the buffer with play() if there's free
@@ -41,7 +41,7 @@ static int play(void* data,int len,int flags);
   rounded down to 0 or the data will never be played (as MPlayer will never
   call play() with a larger len).
 
-static float get_delay(); 
+static float get_delay(void); 
   Returns how long time it will take to play the data currently in the
   output buffer. Be exact, if possible, since the whole timing depends
   on this! In the worst case, return the maximum delay.
diff --git a/DOCS/tech/win32-codec-howto.txt b/DOCS/tech/win32-codec-howto.txt
index e6a684df32..458a9191b3 100644
--- a/DOCS/tech/win32-codec-howto.txt
+++ b/DOCS/tech/win32-codec-howto.txt
@@ -41,7 +41,6 @@ ACM Codecs:
 MPlayer may fail at playing the audio in your file with this message:
 
 Cannot find codec for audio format 0x55.
-Read DOCS/HTML/en/codecs.html!
 Audio: no sound
 
 MPlayer calls this the TwoCC format identifier. From the TwoCC list we find: