diff --git a/ChangeLog b/ChangeLog
index 6a032d7539..0e02e5a822 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,17 @@
 
 HEAD
 
+  * ./plugins/dummy/intf_dummy.c, ./plugins/chroma/i420_yuy2.c,
+    src/interface/intf_eject.c, src/misc/threads.c: win32 compilation fix.
+  * ./plugins/directx/aout_directx.c, plugins/directx/vout_directx.c,
+    ./plugins/directx/vout_events.c: the DirectX notification and event threads
+    now use the vlc_thread_create / vlc_thread_ready scheme. Untested.
+  * ./configure.in: added a check for inttypes.h and sys/int_types.h.
+  * ./configure.in: fixed the HTTP plugin compilation under BeOS.
+  * ./plugins/network/ipv6.c: reactivated IPv6 module.
+  * ./src/misc/beos_specific.cpp: BeOS fixes, removed a static variable.
+  * ./include/main.h: replaced p_sys with explicit variables because it's
+    really much simpler this way.
   * ./src/misc/beos_specific.cpp: the BeOS BApplication thread now uses the
     vlc_thread_create / vlc_thread_ready scheme to signal readiness.
   * ./src/misc/objects.c: prevent the creation of a too small vlc_object_t.
diff --git a/configure b/configure
index 9a517d05d4..77b79d74dd 100755
--- a/configure
+++ b/configure
@@ -3439,71 +3439,71 @@ fi
 
 fi
 
-echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:3444: checking for gethostbyname" >&5
-if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
+echo $ac_n "checking for send""... $ac_c" 1>&6
+echo "configure:3444: checking for send" >&5
+if eval "test \"`echo '$''{'ac_cv_func_send'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 #line 3449 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char gethostbyname(); below.  */
+    which can conflict with char send(); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char gethostbyname();
+char send();
 
 int main() {
 
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname)
+#if defined (__stub_send) || defined (__stub___send)
 choke me
 #else
-gethostbyname();
+send();
 #endif
 
 ; return 0; }
 EOF
 if { (eval echo configure:3472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_func_gethostbyname=yes"
+  eval "ac_cv_func_send=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_func_gethostbyname=no"
+  eval "ac_cv_func_send=no"
 fi
 rm -f conftest*
 fi
 
-if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then
+if eval "test \"`echo '$ac_cv_func_'send`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   :
 else
   echo "$ac_t""no" 1>&6
 
-  echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:3491: checking for gethostbyname in -lnsl" >&5
-ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
+  echo $ac_n "checking for send in -lsocket""... $ac_c" 1>&6
+echo "configure:3491: checking for send in -lsocket" >&5
+ac_lib_var=`echo socket'_'send | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lnsl  $LIBS"
+LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 3499 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char gethostbyname();
+char send();
 
 int main() {
-gethostbyname()
+send()
 ; return 0; }
 EOF
 if { (eval echo configure:3510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
@@ -3521,12 +3521,12 @@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  ipv4_LDFLAGS="${ipv4_LDFLAGS} -lnsl"
+  http_LDFLAGS="${http_LDFLAGS} -lsocket"
+
 else
   echo "$ac_t""no" 1>&6
 fi
 
-
 fi
 
 echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
@@ -3576,14 +3576,14 @@ if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then
 else
   echo "$ac_t""no" 1>&6
 
-  echo $ac_n "checking for gethostbyname in -lbind""... $ac_c" 1>&6
-echo "configure:3581: checking for gethostbyname in -lbind" >&5
-ac_lib_var=`echo bind'_'gethostbyname | sed 'y%./+-%__p_%'`
+  echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
+echo "configure:3581: checking for gethostbyname in -lnsl" >&5
+ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lbind  $LIBS"
+LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 3589 "configure"
 #include "confdefs.h"
@@ -3608,6 +3608,96 @@ fi
 rm -f conftest*
 LIBS="$ac_save_LIBS"
 
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  ipv4_LDFLAGS="${ipv4_LDFLAGS} -lnsl"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+fi
+
+echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
+echo "configure:3624: checking for gethostbyname" >&5
+if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 3629 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char gethostbyname(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char gethostbyname();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname)
+choke me
+#else
+gethostbyname();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:3652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_gethostbyname=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_gethostbyname=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
+
+  echo $ac_n "checking for gethostbyname in -lbind""... $ac_c" 1>&6
+echo "configure:3671: checking for gethostbyname in -lbind" >&5
+ac_lib_var=`echo bind'_'gethostbyname | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lbind  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 3679 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char gethostbyname();
+
+int main() {
+gethostbyname()
+; return 0; }
+EOF
+if { (eval echo configure:3690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
@@ -3622,12 +3712,12 @@ fi
 for ac_func in nanosleep
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3626: checking for $ac_func" >&5
+echo "configure:3716: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3631 "configure"
+#line 3721 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3650,7 +3740,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3672,7 +3762,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for nanosleep in -lrt""... $ac_c" 1>&6
-echo "configure:3676: checking for nanosleep in -lrt" >&5
+echo "configure:3766: checking for nanosleep in -lrt" >&5
 ac_lib_var=`echo rt'_'nanosleep | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3680,7 +3770,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lrt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3684 "configure"
+#line 3774 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3691,7 +3781,7 @@ int main() {
 nanosleep()
 ; return 0; }
 EOF
-if { (eval echo configure:3695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3710,7 +3800,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6
-echo "configure:3714: checking for nanosleep in -lposix4" >&5
+echo "configure:3804: checking for nanosleep in -lposix4" >&5
 ac_lib_var=`echo posix4'_'nanosleep | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3718,7 +3808,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lposix4  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3722 "configure"
+#line 3812 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3729,7 +3819,7 @@ int main() {
 nanosleep()
 ; return 0; }
 EOF
-if { (eval echo configure:3733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3757,12 +3847,12 @@ fi
 done
 
 echo $ac_n "checking for inet_aton""... $ac_c" 1>&6
-echo "configure:3761: checking for inet_aton" >&5
+echo "configure:3851: checking for inet_aton" >&5
 if eval "test \"`echo '$''{'ac_cv_func_inet_aton'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3766 "configure"
+#line 3856 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char inet_aton(); below.  */
@@ -3785,7 +3875,7 @@ inet_aton();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_inet_aton=yes"
 else
@@ -3804,7 +3894,7 @@ else
   echo "$ac_t""no" 1>&6
 
   echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6
-echo "configure:3808: checking for inet_aton in -lresolv" >&5
+echo "configure:3898: checking for inet_aton in -lresolv" >&5
 ac_lib_var=`echo resolv'_'inet_aton | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3812,7 +3902,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3816 "configure"
+#line 3906 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3823,7 +3913,7 @@ int main() {
 inet_aton()
 ; return 0; }
 EOF
-if { (eval echo configure:3827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3847,12 +3937,12 @@ fi
 fi
 
 echo $ac_n "checking for textdomain""... $ac_c" 1>&6
-echo "configure:3851: checking for textdomain" >&5
+echo "configure:3941: checking for textdomain" >&5
 if eval "test \"`echo '$''{'ac_cv_func_textdomain'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3856 "configure"
+#line 3946 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char textdomain(); below.  */
@@ -3875,7 +3965,7 @@ textdomain();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_textdomain=yes"
 else
@@ -3894,7 +3984,7 @@ else
   echo "$ac_t""no" 1>&6
 
   echo $ac_n "checking for textdomain in -lintl""... $ac_c" 1>&6
-echo "configure:3898: checking for textdomain in -lintl" >&5
+echo "configure:3988: checking for textdomain in -lintl" >&5
 ac_lib_var=`echo intl'_'textdomain | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3902,7 +3992,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3906 "configure"
+#line 3996 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3913,7 +4003,7 @@ int main() {
 textdomain()
 ; return 0; }
 EOF
-if { (eval echo configure:3917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3939,12 +4029,12 @@ fi
 
 NEED_GETOPT=0
 echo $ac_n "checking for getopt_long""... $ac_c" 1>&6
-echo "configure:3943: checking for getopt_long" >&5
+echo "configure:4033: checking for getopt_long" >&5
 if eval "test \"`echo '$''{'ac_cv_func_getopt_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3948 "configure"
+#line 4038 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getopt_long(); below.  */
@@ -3967,7 +4057,7 @@ getopt_long();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_getopt_long=yes"
 else
@@ -3989,7 +4079,7 @@ else
   echo "$ac_t""no" 1>&6
  # FreeBSD has a gnugetopt library for this:
   echo $ac_n "checking for getopt_long in -lgnugetopt""... $ac_c" 1>&6
-echo "configure:3993: checking for getopt_long in -lgnugetopt" >&5
+echo "configure:4083: checking for getopt_long in -lgnugetopt" >&5
 ac_lib_var=`echo gnugetopt'_'getopt_long | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3997,7 +4087,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lgnugetopt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4001 "configure"
+#line 4091 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4008,7 +4098,7 @@ int main() {
 getopt_long()
 ; return 0; }
 EOF
-if { (eval echo configure:4012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4036,12 +4126,12 @@ fi
 
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:4040: checking return type of signal handlers" >&5
+echo "configure:4130: checking return type of signal handlers" >&5
 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4045 "configure"
+#line 4135 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -4058,7 +4148,7 @@ int main() {
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:4062: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4152: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -4077,7 +4167,7 @@ EOF
 
 
 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:4081: checking for dlopen in -ldl" >&5
+echo "configure:4171: checking for dlopen in -ldl" >&5
 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4085,7 +4175,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4089 "configure"
+#line 4179 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4096,7 +4186,7 @@ int main() {
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:4100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4117,7 +4207,7 @@ else
 fi
 
 echo $ac_n "checking for cos in -lm""... $ac_c" 1>&6
-echo "configure:4121: checking for cos in -lm" >&5
+echo "configure:4211: checking for cos in -lm" >&5
 ac_lib_var=`echo m'_'cos | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4125,7 +4215,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4129 "configure"
+#line 4219 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4136,7 +4226,7 @@ int main() {
 cos()
 ; return 0; }
 EOF
-if { (eval echo configure:4140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4158,7 +4248,7 @@ else
 fi
 
 echo $ac_n "checking for pow in -lm""... $ac_c" 1>&6
-echo "configure:4162: checking for pow in -lm" >&5
+echo "configure:4252: checking for pow in -lm" >&5
 ac_lib_var=`echo m'_'pow | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4166,7 +4256,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4170 "configure"
+#line 4260 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4177,7 +4267,7 @@ int main() {
 pow()
 ; return 0; }
 EOF
-if { (eval echo configure:4181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4206,7 +4296,7 @@ fi
 THREAD_LIB=error
 if test "x${THREAD_LIB}" = xerror; then
   echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6
-echo "configure:4210: checking for pthread_attr_init in -lpthread" >&5
+echo "configure:4300: checking for pthread_attr_init in -lpthread" >&5
 ac_lib_var=`echo pthread'_'pthread_attr_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4214,7 +4304,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lpthread  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4218 "configure"
+#line 4308 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4225,7 +4315,7 @@ int main() {
 pthread_attr_init()
 ; return 0; }
 EOF
-if { (eval echo configure:4229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4248,7 +4338,7 @@ fi
 fi
 if test "x${THREAD_LIB}" = xerror; then
   echo $ac_n "checking for pthread_attr_init in -lpthreads""... $ac_c" 1>&6
-echo "configure:4252: checking for pthread_attr_init in -lpthreads" >&5
+echo "configure:4342: checking for pthread_attr_init in -lpthreads" >&5
 ac_lib_var=`echo pthreads'_'pthread_attr_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4256,7 +4346,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lpthreads  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4260 "configure"
+#line 4350 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4267,7 +4357,7 @@ int main() {
 pthread_attr_init()
 ; return 0; }
 EOF
-if { (eval echo configure:4271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4290,7 +4380,7 @@ fi
 fi
 if test "x${THREAD_LIB}" = xerror; then
   echo $ac_n "checking for pthread_attr_init in -lc_r""... $ac_c" 1>&6
-echo "configure:4294: checking for pthread_attr_init in -lc_r" >&5
+echo "configure:4384: checking for pthread_attr_init in -lc_r" >&5
 ac_lib_var=`echo c_r'_'pthread_attr_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4298,7 +4388,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lc_r  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4302 "configure"
+#line 4392 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4309,7 +4399,7 @@ int main() {
 pthread_attr_init()
 ; return 0; }
 EOF
-if { (eval echo configure:4313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4332,12 +4422,12 @@ fi
 fi
 if test "x${THREAD_LIB}" = xerror; then
   echo $ac_n "checking for pthread_attr_init""... $ac_c" 1>&6
-echo "configure:4336: checking for pthread_attr_init" >&5
+echo "configure:4426: checking for pthread_attr_init" >&5
 if eval "test \"`echo '$''{'ac_cv_func_pthread_attr_init'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4341 "configure"
+#line 4431 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char pthread_attr_init(); below.  */
@@ -4360,7 +4450,7 @@ pthread_attr_init();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_pthread_attr_init=yes"
 else
@@ -4383,7 +4473,7 @@ fi
 fi
 
 echo $ac_n "checking for cthread_fork in -lthreads""... $ac_c" 1>&6
-echo "configure:4387: checking for cthread_fork in -lthreads" >&5
+echo "configure:4477: checking for cthread_fork in -lthreads" >&5
 ac_lib_var=`echo threads'_'cthread_fork | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4391,7 +4481,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lthreads  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4395 "configure"
+#line 4485 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4402,7 +4492,7 @@ int main() {
 cthread_fork()
 ; return 0; }
 EOF
-if { (eval echo configure:4406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4424,7 +4514,7 @@ fi
 
 
 cat > conftest.$ac_ext <<EOF
-#line 4428 "configure"
+#line 4518 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 EOF
@@ -4440,7 +4530,7 @@ fi
 rm -f conftest*
 
 cat > conftest.$ac_ext <<EOF
-#line 4444 "configure"
+#line 4534 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 EOF
@@ -4456,7 +4546,7 @@ fi
 rm -f conftest*
 
 cat > conftest.$ac_ext <<EOF
-#line 4460 "configure"
+#line 4550 "configure"
 #include "confdefs.h"
 #include <strings.h>
 EOF
@@ -4472,21 +4562,21 @@ fi
 rm -f conftest*
 
 
-for ac_hdr in stdint.h getopt.h strings.h
+for ac_hdr in stdint.h getopt.h strings.h inttypes.h sys/int_types.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4480: checking for $ac_hdr" >&5
+echo "configure:4570: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4485 "configure"
+#line 4575 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4490: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4580: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4516,17 +4606,17 @@ for ac_hdr in sys/sockio.h fcntl.h sys/types.h sys/time.h sys/times.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4520: checking for $ac_hdr" >&5
+echo "configure:4610: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4525 "configure"
+#line 4615 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4530: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4620: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4556,17 +4646,17 @@ for ac_hdr in dlfcn.h image.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4560: checking for $ac_hdr" >&5
+echo "configure:4650: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4565 "configure"
+#line 4655 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4570: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4660: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4596,17 +4686,17 @@ for ac_hdr in arpa/inet.h net/if.h netinet/in.h sys/socket.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4600: checking for $ac_hdr" >&5
+echo "configure:4690: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4605 "configure"
+#line 4695 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4610: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4700: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4636,17 +4726,17 @@ for ac_hdr in machine/param.h sys/shm.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4640: checking for $ac_hdr" >&5
+echo "configure:4730: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4645 "configure"
+#line 4735 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4650: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4740: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4676,17 +4766,17 @@ for ac_hdr in linux/version.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4680: checking for $ac_hdr" >&5
+echo "configure:4770: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4685 "configure"
+#line 4775 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4690: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4780: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4714,12 +4804,12 @@ done
 
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:4718: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:4808: checking whether time.h and sys/time.h may both be included" >&5
 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4723 "configure"
+#line 4813 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -4728,7 +4818,7 @@ int main() {
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:4732: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4822: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -4750,7 +4840,7 @@ fi
 
 
 cat > conftest.$ac_ext <<EOF
-#line 4754 "configure"
+#line 4844 "configure"
 #include "confdefs.h"
 #include <time.h>
 EOF
@@ -4768,7 +4858,7 @@ rm -f conftest*
 
 
 cat > conftest.$ac_ext <<EOF
-#line 4772 "configure"
+#line 4862 "configure"
 #include "confdefs.h"
 #include <sys/time.h>
 EOF
@@ -4789,17 +4879,17 @@ for ac_hdr in cthreads.h pthread.h kernel/scheduler.h kernel/OS.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4793: checking for $ac_hdr" >&5
+echo "configure:4883: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4798 "configure"
+#line 4888 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4803: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4893: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4839,17 +4929,17 @@ then
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4843: checking for $ac_hdr" >&5
+echo "configure:4933: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4848 "configure"
+#line 4938 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4853: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4943: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4871,7 +4961,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
 EOF
  
     cat > conftest.$ac_ext <<EOF
-#line 4875 "configure"
+#line 4965 "configure"
 #include "confdefs.h"
 #include <X11/extensions/dpms.h>
 EOF
@@ -4897,20 +4987,20 @@ done
 fi
 
 echo $ac_n "checking for ntohl in sys/param.h""... $ac_c" 1>&6
-echo "configure:4901: checking for ntohl in sys/param.h" >&5
+echo "configure:4991: checking for ntohl in sys/param.h" >&5
 if eval "test \"`echo '$''{'ac_cv_c_ntohl_sys_param_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   CFLAGS="${save_CFLAGS} -Wall -Werror"
      cat > conftest.$ac_ext <<EOF
-#line 4907 "configure"
+#line 4997 "configure"
 #include "confdefs.h"
 #include <sys/param.h>
 int main() {
 void foo() { int meuh; ntohl(meuh); }
 ; return 0; }
 EOF
-if { (eval echo configure:4914: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5004: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_ntohl_sys_param_h=yes
 else
@@ -4931,20 +5021,20 @@ EOF
 fi
 
 echo $ac_n "checking if \$CC accepts -finline-limit""... $ac_c" 1>&6
-echo "configure:4935: checking if \$CC accepts -finline-limit" >&5
+echo "configure:5025: checking if \$CC accepts -finline-limit" >&5
 if eval "test \"`echo '$''{'ac_cv_c_inline_limit'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   CFLAGS="${save_CFLAGS} -finline-limit-30000"
      cat > conftest.$ac_ext <<EOF
-#line 4941 "configure"
+#line 5031 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:4948: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5038: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline_limit=yes
 else
@@ -4962,20 +5052,20 @@ if test x"$ac_cv_c_inline_limit" != x"no"; then
 fi
 
 echo $ac_n "checking if \$CC accepts -Wall -Winline""... $ac_c" 1>&6
-echo "configure:4966: checking if \$CC accepts -Wall -Winline" >&5
+echo "configure:5056: checking if \$CC accepts -Wall -Winline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_Wall_Winline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   CFLAGS="-Wall -Winline ${save_CFLAGS}"
      cat > conftest.$ac_ext <<EOF
-#line 4972 "configure"
+#line 5062 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:4979: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5069: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_Wall_Winline=yes
 else
@@ -4992,20 +5082,20 @@ if test x"$ac_cv_c_Wall_Winline" != x"no"; then
     save_CFLAGS="-Wall -Winline ${save_CFLAGS}"
 else
     echo $ac_n "checking if \$CC accepts -wall -winline""... $ac_c" 1>&6
-echo "configure:4996: checking if \$CC accepts -wall -winline" >&5
+echo "configure:5086: checking if \$CC accepts -wall -winline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_wall_winline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   CFLAGS="-wall -winline ${save_CFLAGS}"
          cat > conftest.$ac_ext <<EOF
-#line 5002 "configure"
+#line 5092 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:5009: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5099: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_wall_winline=yes
 else
@@ -5024,20 +5114,20 @@ echo "$ac_t""$ac_cv_c_wall_winline" 1>&6
 fi
 
 echo $ac_n "checking if \$CC accepts -pipe""... $ac_c" 1>&6
-echo "configure:5028: checking if \$CC accepts -pipe" >&5
+echo "configure:5118: checking if \$CC accepts -pipe" >&5
 if eval "test \"`echo '$''{'ac_cv_c_pipe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   CFLAGS="${save_CFLAGS} -pipe"
      cat > conftest.$ac_ext <<EOF
-#line 5034 "configure"
+#line 5124 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:5041: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5131: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_pipe=yes
 else
@@ -5055,20 +5145,20 @@ if test x"$ac_cv_c_pipe" != x"no"; then
 fi
 
 echo $ac_n "checking if \$CC accepts -O3""... $ac_c" 1>&6
-echo "configure:5059: checking if \$CC accepts -O3" >&5
+echo "configure:5149: checking if \$CC accepts -O3" >&5
 if eval "test \"`echo '$''{'ac_cv_c_o3'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   CFLAGS="${save_CFLAGS} -O3"
      cat > conftest.$ac_ext <<EOF
-#line 5065 "configure"
+#line 5155 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:5072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5162: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_o3=yes
 else
@@ -5085,20 +5175,20 @@ if test x"$ac_cv_c_o3" != x"no"; then
     CFLAGS_OPTIM="${CFLAGS_OPTIM} -O3"
 else
     echo $ac_n "checking if \$CC accepts -O2""... $ac_c" 1>&6
-echo "configure:5089: checking if \$CC accepts -O2" >&5
+echo "configure:5179: checking if \$CC accepts -O2" >&5
 if eval "test \"`echo '$''{'ac_cv_c_o2'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   CFLAGS="${save_CFLAGS} -O2"
          cat > conftest.$ac_ext <<EOF
-#line 5095 "configure"
+#line 5185 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:5102: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5192: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_o2=yes
 else
@@ -5115,20 +5205,20 @@ echo "$ac_t""$ac_cv_c_o2" 1>&6
         CFLAGS_OPTIM="${CFLAGS_OPTIM} -O2"
     else
         echo $ac_n "checking if \$CC accepts -O""... $ac_c" 1>&6
-echo "configure:5119: checking if \$CC accepts -O" >&5
+echo "configure:5209: checking if \$CC accepts -O" >&5
 if eval "test \"`echo '$''{'ac_cv_c_o'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   CFLAGS="${save_CFLAGS} -O"
              cat > conftest.$ac_ext <<EOF
-#line 5125 "configure"
+#line 5215 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:5132: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_o=yes
 else
@@ -5148,20 +5238,20 @@ echo "$ac_t""$ac_cv_c_o" 1>&6
 fi
 
 echo $ac_n "checking if \$CC accepts -ffast-math""... $ac_c" 1>&6
-echo "configure:5152: checking if \$CC accepts -ffast-math" >&5
+echo "configure:5242: checking if \$CC accepts -ffast-math" >&5
 if eval "test \"`echo '$''{'ac_cv_c_fast_math'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   CFLAGS="${save_CFLAGS} -ffast-math"
      cat > conftest.$ac_ext <<EOF
-#line 5158 "configure"
+#line 5248 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:5165: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5255: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_fast_math=yes
 else
@@ -5179,20 +5269,20 @@ if test x"$ac_cv_c_fast_math" != x"no"; then
 fi
 
 echo $ac_n "checking if \$CC accepts -funroll-loops""... $ac_c" 1>&6
-echo "configure:5183: checking if \$CC accepts -funroll-loops" >&5
+echo "configure:5273: checking if \$CC accepts -funroll-loops" >&5
 if eval "test \"`echo '$''{'ac_cv_c_unroll_loops'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   CFLAGS="${save_CFLAGS} -funroll-loops"
      cat > conftest.$ac_ext <<EOF
-#line 5189 "configure"
+#line 5279 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:5196: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5286: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_unroll_loops=yes
 else
@@ -5210,20 +5300,20 @@ if test x"$ac_cv_c_unroll_loops" != x"no"; then
 fi
 
 echo $ac_n "checking if \$CC accepts -fomit-frame-pointer""... $ac_c" 1>&6
-echo "configure:5214: checking if \$CC accepts -fomit-frame-pointer" >&5
+echo "configure:5304: checking if \$CC accepts -fomit-frame-pointer" >&5
 if eval "test \"`echo '$''{'ac_cv_c_omit_frame_pointer'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   CFLAGS="${save_CFLAGS} -fomit-frame-pointer"
      cat > conftest.$ac_ext <<EOF
-#line 5220 "configure"
+#line 5310 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:5227: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5317: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_omit_frame_pointer=yes
 else
@@ -5241,20 +5331,20 @@ if test x"$ac_cv_c_omit_frame_pointer" != x"no"; then
 fi
 
 echo $ac_n "checking if \$CC accepts -bundle -undefined error -lcc_dynamic""... $ac_c" 1>&6
-echo "configure:5245: checking if \$CC accepts -bundle -undefined error -lcc_dynamic" >&5
+echo "configure:5335: checking if \$CC accepts -bundle -undefined error -lcc_dynamic" >&5
 if eval "test \"`echo '$''{'ac_cv_ld_darwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   CFLAGS="${save_CFLAGS} -bundle -undefined error -lcc_dynamic"
      cat > conftest.$ac_ext <<EOF
-#line 5251 "configure"
+#line 5341 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:5258: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_ld_darwin=yes
 else
@@ -5272,20 +5362,20 @@ if test x"$ac_cv_ld_darwin" != x"no"; then
 fi
 
 echo $ac_n "checking if \$CC accepts -shared""... $ac_c" 1>&6
-echo "configure:5276: checking if \$CC accepts -shared" >&5
+echo "configure:5366: checking if \$CC accepts -shared" >&5
 if eval "test \"`echo '$''{'ac_cv_ld_plugins'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   CFLAGS="${save_CFLAGS} -shared"
      cat > conftest.$ac_ext <<EOF
-#line 5282 "configure"
+#line 5372 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:5289: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5379: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_ld_plugins=yes
 else
@@ -5303,13 +5393,13 @@ if test x"$ac_cv_ld_plugins" != x"no"; then
 fi
         
 echo $ac_n "checking for variadic cpp macros""... $ac_c" 1>&6
-echo "configure:5307: checking for variadic cpp macros" >&5
+echo "configure:5397: checking for variadic cpp macros" >&5
 if eval "test \"`echo '$''{'ac_cv_cpp_variadic_macros'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   CFLAGS="${save_CFLAGS}"
      cat > conftest.$ac_ext <<EOF
-#line 5313 "configure"
+#line 5403 "configure"
 #include "confdefs.h"
 #include <stdio.h>
           #define a(b,c...) printf(b,##c)
@@ -5317,7 +5407,7 @@ int main() {
 a("foo");a("%s","bar");a("%s%s","baz","quux");
 ; return 0; }
 EOF
-if { (eval echo configure:5321: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5411: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cpp_variadic_macros=yes
 else
@@ -5338,7 +5428,7 @@ EOF
 fi
 
 echo $ac_n "checking __attribute__ ((aligned ())) support""... $ac_c" 1>&6
-echo "configure:5342: checking __attribute__ ((aligned ())) support" >&5
+echo "configure:5432: checking __attribute__ ((aligned ())) support" >&5
 if eval "test \"`echo '$''{'ac_cv_c_attribute_aligned'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5346,14 +5436,14 @@ else
         CFLAGS="${save_CFLAGS} -Werror"
     for ac_cv_c_attr_align_try in 2 4 8 16 32 64; do
         cat > conftest.$ac_ext <<EOF
-#line 5350 "configure"
+#line 5440 "configure"
 #include "confdefs.h"
 
 int main() {
 static char c __attribute__ ((aligned($ac_cv_c_attr_align_try))) = 0; return c;
 ; return 0; }
 EOF
-if { (eval echo configure:5357: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5447: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_attribute_aligned=$ac_cv_c_attr_align_try
 else
@@ -5391,20 +5481,20 @@ SSE_MODULES="imdctsse downmixsse"
 ALTIVEC_MODULES="idctaltivec motionaltivec memcpyaltivec"
 
 echo $ac_n "checking if \$CC groks MMX inline assembly""... $ac_c" 1>&6
-echo "configure:5395: checking if \$CC groks MMX inline assembly" >&5
+echo "configure:5485: checking if \$CC groks MMX inline assembly" >&5
 if eval "test \"`echo '$''{'ac_cv_mmx_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   CFLAGS="${save_CFLAGS}"
      cat > conftest.$ac_ext <<EOF
-#line 5401 "configure"
+#line 5491 "configure"
 #include "confdefs.h"
 
 int main() {
 void *p;asm volatile("packuswb %%mm1,%%mm2"::"r"(p));
 ; return 0; }
 EOF
-if { (eval echo configure:5408: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5498: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mmx_inline=yes
 else
@@ -5422,20 +5512,20 @@ if test x"$ac_cv_mmx_inline" != x"no"; then
 fi
 
 echo $ac_n "checking if \$CC groks MMX EXT inline assembly""... $ac_c" 1>&6
-echo "configure:5426: checking if \$CC groks MMX EXT inline assembly" >&5
+echo "configure:5516: checking if \$CC groks MMX EXT inline assembly" >&5
 if eval "test \"`echo '$''{'ac_cv_mmxext_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   CFLAGS="${save_CFLAGS}"
      cat > conftest.$ac_ext <<EOF
-#line 5432 "configure"
+#line 5522 "configure"
 #include "confdefs.h"
 
 int main() {
 void *p;asm volatile("maskmovq %%mm1,%%mm2"::"r"(p));
 ; return 0; }
 EOF
-if { (eval echo configure:5439: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5529: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mmxext_inline=yes
 else
@@ -5453,20 +5543,20 @@ if test x"$ac_cv_mmxext_inline" != x"no"; then
 fi
 
 echo $ac_n "checking if \$CC groks 3D Now! inline assembly""... $ac_c" 1>&6
-echo "configure:5457: checking if \$CC groks 3D Now! inline assembly" >&5
+echo "configure:5547: checking if \$CC groks 3D Now! inline assembly" >&5
 if eval "test \"`echo '$''{'ac_cv_3dnow_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   CFLAGS="${save_CFLAGS}"
      cat > conftest.$ac_ext <<EOF
-#line 5463 "configure"
+#line 5553 "configure"
 #include "confdefs.h"
 
 int main() {
 void *p;asm volatile("pfadd %%mm1,%%mm2"::"r"(p));
 ; return 0; }
 EOF
-if { (eval echo configure:5470: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5560: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_3dnow_inline=yes
 else
@@ -5488,20 +5578,20 @@ EOF
 fi
 
 echo $ac_n "checking if \$CC groks SSE inline assembly""... $ac_c" 1>&6
-echo "configure:5492: checking if \$CC groks SSE inline assembly" >&5
+echo "configure:5582: checking if \$CC groks SSE inline assembly" >&5
 if eval "test \"`echo '$''{'ac_cv_sse_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   CFLAGS="${save_CFLAGS}"
      cat > conftest.$ac_ext <<EOF
-#line 5498 "configure"
+#line 5588 "configure"
 #include "confdefs.h"
 
 int main() {
 void *p;asm volatile("xorps %%xmm1,%%xmm2"::"r"(p));
 ; return 0; }
 EOF
-if { (eval echo configure:5505: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5595: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_sse_inline=yes
 else
@@ -5526,20 +5616,20 @@ fi
 # we should be able to remove this test with future versions of mingw32
 if test x$SYS != xmingw32; then
 echo $ac_n "checking if \$CC groks AltiVec inline assembly""... $ac_c" 1>&6
-echo "configure:5530: checking if \$CC groks AltiVec inline assembly" >&5
+echo "configure:5620: checking if \$CC groks AltiVec inline assembly" >&5
 if eval "test \"`echo '$''{'ac_cv_altivec_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   CFLAGS="${save_CFLAGS}"
      cat > conftest.$ac_ext <<EOF
-#line 5536 "configure"
+#line 5626 "configure"
 #include "confdefs.h"
 
 int main() {
 asm volatile("vperm 0,1,2,3");
 ; return 0; }
 EOF
-if { (eval echo configure:5543: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5633: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_altivec_inline=yes
 else
@@ -5548,14 +5638,14 @@ else
   rm -rf conftest*
   CFLAGS="$save_CFLAGS -Wa,-m7400"
           cat > conftest.$ac_ext <<EOF
-#line 5552 "configure"
+#line 5642 "configure"
 #include "confdefs.h"
 
 int main() {
 asm volatile("vperm 0,1,2,3");
 ; return 0; }
 EOF
-if { (eval echo configure:5559: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5649: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_altivec_inline="-Wa,-m7400"
 else
@@ -5586,21 +5676,21 @@ EOF
 fi
 
 echo $ac_n "checking if \$CC groks AltiVec C extensions""... $ac_c" 1>&6
-echo "configure:5590: checking if \$CC groks AltiVec C extensions" >&5
+echo "configure:5680: checking if \$CC groks AltiVec C extensions" >&5
 if eval "test \"`echo '$''{'ac_cv_c_altivec'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   CFLAGS="$save_CFLAGS -faltivec"
      # Darwin test
      cat > conftest.$ac_ext <<EOF
-#line 5597 "configure"
+#line 5687 "configure"
 #include "confdefs.h"
 
 int main() {
 vec_mtvscr((vector unsigned int)(0));
 ; return 0; }
 EOF
-if { (eval echo configure:5604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5694: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_altivec=-faltivec
 else
@@ -5611,14 +5701,14 @@ else
         # Linux/PPC test
         CFLAGS="$save_CFLAGS $idctaltivec_CFLAGS -fvec"
         cat > conftest.$ac_ext <<EOF
-#line 5615 "configure"
+#line 5705 "configure"
 #include "confdefs.h"
 
 int main() {
 vec_mtvscr((vector unsigned int)(0));
 ; return 0; }
 EOF
-if { (eval echo configure:5622: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5712: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_altivec="-fvec"
 else
@@ -5648,20 +5738,20 @@ EOF
 fi
 
 echo $ac_n "checking if linker needs -framework vecLib""... $ac_c" 1>&6
-echo "configure:5652: checking if linker needs -framework vecLib" >&5
+echo "configure:5742: checking if linker needs -framework vecLib" >&5
 if eval "test \"`echo '$''{'ac_cv_ld_altivec'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   LDFLAGS="$vlc_LDFLAGS -framework vecLib"
      cat > conftest.$ac_ext <<EOF
-#line 5658 "configure"
+#line 5748 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:5665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_ld_altivec=yes
 else
@@ -5792,17 +5882,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5796: checking for $ac_hdr" >&5
+echo "configure:5886: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5801 "configure"
+#line 5891 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5806: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5896: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5833,7 +5923,7 @@ done
 
     else
       echo $ac_n "checking for libdvdcss.a in ${with_dvdcss_tree}""... $ac_c" 1>&6
-echo "configure:5837: checking for libdvdcss.a in ${with_dvdcss_tree}" >&5
+echo "configure:5927: checking for libdvdcss.a in ${with_dvdcss_tree}" >&5
       real_dvdcss_tree="`cd ${with_dvdcss_tree} 2>/dev/null && pwd`"
       if test "x$real_dvdcss_tree" = x
       then
@@ -5859,7 +5949,7 @@ echo "configure:5837: checking for libdvdcss.a in ${with_dvdcss_tree}" >&5
   ;;
   *)
     echo $ac_n "checking for dvdcss headers in ${with_dvdcss}""... $ac_c" 1>&6
-echo "configure:5863: checking for dvdcss headers in ${with_dvdcss}" >&5
+echo "configure:5953: checking for dvdcss headers in ${with_dvdcss}" >&5
     if test -f ${with_dvdcss}/include/dvdcss/dvdcss.h
     then
             echo "$ac_t""yes" 1>&6
@@ -5901,17 +5991,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5905: checking for $ac_hdr" >&5
+echo "configure:5995: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5910 "configure"
+#line 6000 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5915: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6005: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5934,14 +6024,14 @@ EOF
  
      CFLAGS="${save_CFLAGS}"
      cat > conftest.$ac_ext <<EOF
-#line 5938 "configure"
+#line 6028 "configure"
 #include "confdefs.h"
 #include <dvdread/dvd_reader.h>
 int main() {
 void foo() { int i=DVD_VIDEO_LB_LEN; }
 ; return 0; }
 EOF
-if { (eval echo configure:5945: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6035: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
           PLUGINS="${PLUGINS} dvdread"
@@ -6004,17 +6094,17 @@ fi
   CPPFLAGS="$save_CPPFLAGS $test_CFLAGS"
   ac_safe=`echo "dvbpsi/dr.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dvbpsi/dr.h""... $ac_c" 1>&6
-echo "configure:6008: checking for dvbpsi/dr.h" >&5
+echo "configure:6098: checking for dvbpsi/dr.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6013 "configure"
+#line 6103 "configure"
 #include "confdefs.h"
 #include <dvbpsi/dr.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6018: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6108: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6058,7 +6148,7 @@ fi
 if test x$enable_vcd != xno
 then
   cat > conftest.$ac_ext <<EOF
-#line 6062 "configure"
+#line 6152 "configure"
 #include "confdefs.h"
 #include <linux/cdrom.h>
 EOF
@@ -6073,7 +6163,7 @@ rm -f conftest*
 
   
   cat > conftest.$ac_ext <<EOF
-#line 6077 "configure"
+#line 6167 "configure"
 #include "confdefs.h"
 #include <sys/cdio.h>
 EOF
@@ -6117,12 +6207,12 @@ if test x$SYS != xnto && test "x$SYS" != "xmingw32"
 then
   CFLAGS="$save_CFLAGS"
   echo $ac_n "checking for inet_pton""... $ac_c" 1>&6
-echo "configure:6121: checking for inet_pton" >&5
+echo "configure:6211: checking for inet_pton" >&5
 if eval "test \"`echo '$''{'ac_cv_func_inet_pton'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6126 "configure"
+#line 6216 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char inet_pton(); below.  */
@@ -6145,7 +6235,7 @@ inet_pton();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_inet_pton=yes"
 else
@@ -6168,9 +6258,9 @@ fi
 if test "x$SYS" = "xmingw32"
 then
   echo $ac_n "checking for getaddrinfo in ws2tcpip.h""... $ac_c" 1>&6
-echo "configure:6172: checking for getaddrinfo in ws2tcpip.h" >&5
+echo "configure:6262: checking for getaddrinfo in ws2tcpip.h" >&5
   cat > conftest.$ac_ext <<EOF
-#line 6174 "configure"
+#line 6264 "configure"
 #include "confdefs.h"
 #include <ws2tcpip.h>
 EOF
@@ -6241,7 +6331,7 @@ fi
       { echo "configure: error: ${with_mad_tree} directory doesn't exist" 1>&2; exit 1; }
     fi
         echo $ac_n "checking for mad.h in ${real_mad_tree}/libmad""... $ac_c" 1>&6
-echo "configure:6245: checking for mad.h in ${real_mad_tree}/libmad" >&5
+echo "configure:6335: checking for mad.h in ${real_mad_tree}/libmad" >&5
     if test -f ${real_mad_tree}/libmad/mad.h
     then
       echo "$ac_t""yes" 1>&6
@@ -6250,7 +6340,7 @@ echo "configure:6245: checking for mad.h in ${real_mad_tree}/libmad" >&5
       save_LDFLAGS=$LDFLAGS
       LDFLAGS=$mad_LDFLAGS
       echo $ac_n "checking for mad_bit_init in -lmad""... $ac_c" 1>&6
-echo "configure:6254: checking for mad_bit_init in -lmad" >&5
+echo "configure:6344: checking for mad_bit_init in -lmad" >&5
 ac_lib_var=`echo mad'_'mad_bit_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6258,7 +6348,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lmad  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6262 "configure"
+#line 6352 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6269,7 +6359,7 @@ int main() {
 mad_bit_init()
 ; return 0; }
 EOF
-if { (eval echo configure:6273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6306,17 +6396,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6310: checking for $ac_hdr" >&5
+echo "configure:6400: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6315 "configure"
+#line 6405 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6320: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6410: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6344,7 +6434,7 @@ fi
 done
 
     echo $ac_n "checking for mad_bit_init in -lmad""... $ac_c" 1>&6
-echo "configure:6348: checking for mad_bit_init in -lmad" >&5
+echo "configure:6438: checking for mad_bit_init in -lmad" >&5
 ac_lib_var=`echo mad'_'mad_bit_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6352,7 +6442,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lmad  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6356 "configure"
+#line 6446 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6363,7 +6453,7 @@ int main() {
 mad_bit_init()
 ; return 0; }
 EOF
-if { (eval echo configure:6367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6418,7 +6508,7 @@ fi
   if test "x$with_ffmpeg_tree" != "x"
   then
     echo $ac_n "checking for libavcodec.a in ${with_ffmpeg_tree}""... $ac_c" 1>&6
-echo "configure:6422: checking for libavcodec.a in ${with_ffmpeg_tree}" >&5
+echo "configure:6512: checking for libavcodec.a in ${with_ffmpeg_tree}" >&5
     real_ffmpeg_tree="`cd ${with_ffmpeg_tree} 2>/dev/null && pwd`"
     if test "x$real_ffmpeg_tree" = x
     then
@@ -6441,7 +6531,7 @@ echo "configure:6422: checking for libavcodec.a in ${with_ffmpeg_tree}" >&5
     CFLAGS="$CFLAGS $ffmpeg_CFLAGS"
     LDFLAGS="$LDFLAGS $ffmpeg_LDFLAGS -lm"
     echo $ac_n "checking for avcodec_init in -lavcodec""... $ac_c" 1>&6
-echo "configure:6445: checking for avcodec_init in -lavcodec" >&5
+echo "configure:6535: checking for avcodec_init in -lavcodec" >&5
 ac_lib_var=`echo avcodec'_'avcodec_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6449,7 +6539,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lavcodec  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6453 "configure"
+#line 6543 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6460,7 +6550,7 @@ int main() {
 avcodec_init()
 ; return 0; }
 EOF
-if { (eval echo configure:6464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6517,7 +6607,7 @@ fi
       { echo "configure: error: ${with_a52_tree} directory doesn't exist" 1>&2; exit 1; }
     fi
         echo $ac_n "checking for a52.h in ${real_a52_tree}/include""... $ac_c" 1>&6
-echo "configure:6521: checking for a52.h in ${real_a52_tree}/include" >&5
+echo "configure:6611: checking for a52.h in ${real_a52_tree}/include" >&5
     if test -f ${real_a52_tree}/include/a52.h
     then
       echo "$ac_t""yes" 1>&6
@@ -6526,7 +6616,7 @@ echo "configure:6521: checking for a52.h in ${real_a52_tree}/include" >&5
       save_LDFLAGS=$LDFLAGS
       LDFLAGS="$a52_LDFLAGS $LDFLAGS"
       echo $ac_n "checking for a52_free in -la52""... $ac_c" 1>&6
-echo "configure:6530: checking for a52_free in -la52" >&5
+echo "configure:6620: checking for a52_free in -la52" >&5
 ac_lib_var=`echo a52'_'a52_free | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6534,7 +6624,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-la52 -lm $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6538 "configure"
+#line 6628 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6545,7 +6635,7 @@ int main() {
 a52_free()
 ; return 0; }
 EOF
-if { (eval echo configure:6549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6586,17 +6676,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6590: checking for $ac_hdr" >&5
+echo "configure:6680: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6595 "configure"
+#line 6685 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6600: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6690: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6618,7 +6708,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
 EOF
  
       echo $ac_n "checking for a52_free in -la52""... $ac_c" 1>&6
-echo "configure:6622: checking for a52_free in -la52" >&5
+echo "configure:6712: checking for a52_free in -la52" >&5
 ac_lib_var=`echo a52'_'a52_free | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6626,7 +6716,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-la52 -lm $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6630 "configure"
+#line 6720 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6637,7 +6727,7 @@ int main() {
 a52_free()
 ; return 0; }
 EOF
-if { (eval echo configure:6641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6682,17 +6772,17 @@ then
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6686: checking for $ac_hdr" >&5
+echo "configure:6776: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6691 "configure"
+#line 6781 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6696: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6786: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6750,17 +6840,17 @@ if test x$enable_x11 != xno &&
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6754: checking for $ac_hdr" >&5
+echo "configure:6844: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6759 "configure"
+#line 6849 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6764: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6854: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6812,17 +6902,17 @@ if test x$enable_xvideo != xno &&
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6816: checking for $ac_hdr" >&5
+echo "configure:6906: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6821 "configure"
+#line 6911 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6826: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6916: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6845,7 +6935,7 @@ EOF
  
     CFLAGS="$save_CFLAGS -L$x_libraries -lX11 -lXext"
     echo $ac_n "checking for XvSetPortAttribute in -lXv_pic""... $ac_c" 1>&6
-echo "configure:6849: checking for XvSetPortAttribute in -lXv_pic" >&5
+echo "configure:6939: checking for XvSetPortAttribute in -lXv_pic" >&5
 ac_lib_var=`echo Xv_pic'_'XvSetPortAttribute | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6853,7 +6943,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lXv_pic  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6857 "configure"
+#line 6947 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6864,7 +6954,7 @@ int main() {
 XvSetPortAttribute()
 ; return 0; }
 EOF
-if { (eval echo configure:6868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6921,7 +7011,7 @@ fi
   # Extract the first word of "sdl12-config", so it can be a program name with args.
 set dummy sdl12-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6925: checking for $ac_word" >&5
+echo "configure:7015: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_SDL12_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6961,7 +7051,7 @@ fi
     # Extract the first word of "sdl11-config", so it can be a program name with args.
 set dummy sdl11-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6965: checking for $ac_word" >&5
+echo "configure:7055: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_SDL11_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7002,7 +7092,7 @@ fi
     # Extract the first word of "sdl-config", so it can be a program name with args.
 set dummy sdl-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7006: checking for $ac_word" >&5
+echo "configure:7096: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_SDL_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7047,17 +7137,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7051: checking for $ac_hdr" >&5
+echo "configure:7141: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7056 "configure"
+#line 7146 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7061: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7151: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7127,17 +7217,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7131: checking for $ac_hdr" >&5
+echo "configure:7221: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7136 "configure"
+#line 7226 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7141: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7231: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7166,7 +7256,7 @@ done
 
     else
       echo $ac_n "checking for directX headers in ${with_directx}""... $ac_c" 1>&6
-echo "configure:7170: checking for directX headers in ${with_directx}" >&5
+echo "configure:7260: checking for directX headers in ${with_directx}" >&5
       if test -f ${with_directx}/ddraw.h
       then
         PLUGINS="${PLUGINS} directx"
@@ -7193,17 +7283,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7197: checking for $ac_hdr" >&5
+echo "configure:7287: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7202 "configure"
+#line 7292 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7207: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7297: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7298,17 +7388,17 @@ if test x$enable_aa = xyes
 then
   ac_safe=`echo "aalib.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for aalib.h""... $ac_c" 1>&6
-echo "configure:7302: checking for aalib.h" >&5
+echo "configure:7392: checking for aalib.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7307 "configure"
+#line 7397 "configure"
 #include "confdefs.h"
 #include <aalib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7312: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7402: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7359,17 +7449,17 @@ then
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7363: checking for $ac_hdr" >&5
+echo "configure:7453: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7368 "configure"
+#line 7458 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7373: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7463: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7392,7 +7482,7 @@ EOF
  
     PLUGINS="${PLUGINS} dsp"
     echo $ac_n "checking for main in -lossaudio""... $ac_c" 1>&6
-echo "configure:7396: checking for main in -lossaudio" >&5
+echo "configure:7486: checking for main in -lossaudio" >&5
 ac_lib_var=`echo ossaudio'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7400,14 +7490,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lossaudio  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7404 "configure"
+#line 7494 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:7411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7443,7 +7533,7 @@ if test "${enable_esd+set}" = set; then
      # Extract the first word of "esd-config", so it can be a program name with args.
 set dummy esd-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7447: checking for $ac_word" >&5
+echo "configure:7537: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_ESD_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7494,7 +7584,7 @@ if test "${enable_arts+set}" = set; then
      # Extract the first word of "artsc-config", so it can be a program name with args.
 set dummy artsc-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7498: checking for $ac_word" >&5
+echo "configure:7588: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_ARTS_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7544,17 +7634,17 @@ if test "${enable_alsa+set}" = set; then
    then
      ac_safe=`echo "alsa/asoundlib.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for alsa/asoundlib.h""... $ac_c" 1>&6
-echo "configure:7548: checking for alsa/asoundlib.h" >&5
+echo "configure:7638: checking for alsa/asoundlib.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7553 "configure"
+#line 7643 "configure"
 #include "confdefs.h"
 #include <alsa/asoundlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7558: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7648: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7571,7 +7661,7 @@ fi
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for main in -lasound""... $ac_c" 1>&6
-echo "configure:7575: checking for main in -lasound" >&5
+echo "configure:7665: checking for main in -lasound" >&5
 ac_lib_var=`echo asound'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7579,14 +7669,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lasound  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7583 "configure"
+#line 7673 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:7590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7663,7 +7753,7 @@ fi
   # Extract the first word of "gtk12-config", so it can be a program name with args.
 set dummy gtk12-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7667: checking for $ac_word" >&5
+echo "configure:7757: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GTK12_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7702,7 +7792,7 @@ fi
     # Extract the first word of "gtk-config", so it can be a program name with args.
 set dummy gtk-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7706: checking for $ac_word" >&5
+echo "configure:7796: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7751,17 +7841,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7755: checking for $ac_hdr" >&5
+echo "configure:7845: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7760 "configure"
+#line 7850 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7765: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7855: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7807,7 +7897,7 @@ if test "${enable_gnome+set}" = set; then
     # Extract the first word of "gnome-config", so it can be a program name with args.
 set dummy gnome-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7811: checking for $ac_word" >&5
+echo "configure:7901: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GNOME_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7851,17 +7941,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7855: checking for $ac_hdr" >&5
+echo "configure:7945: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7860 "configure"
+#line 7950 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7865: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7955: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7948,17 +8038,17 @@ else
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7952: checking for $ac_hdr" >&5
+echo "configure:8042: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7957 "configure"
+#line 8047 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7962: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8052: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8001,17 +8091,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8005: checking for $ac_hdr" >&5
+echo "configure:8095: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8010 "configure"
+#line 8100 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8015: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8105: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8082,17 +8172,17 @@ if test x$enable_lirc = xyes
 then
   ac_safe=`echo "lirc/lirc_client.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for lirc/lirc_client.h""... $ac_c" 1>&6
-echo "configure:8086: checking for lirc/lirc_client.h" >&5
+echo "configure:8176: checking for lirc/lirc_client.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8091 "configure"
+#line 8181 "configure"
 #include "confdefs.h"
 #include <lirc/lirc_client.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8096: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8186: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8109,7 +8199,7 @@ fi
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for lirc_init in -llirc_client""... $ac_c" 1>&6
-echo "configure:8113: checking for lirc_init in -llirc_client" >&5
+echo "configure:8203: checking for lirc_init in -llirc_client" >&5
 ac_lib_var=`echo lirc_client'_'lirc_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -8117,7 +8207,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-llirc_client  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8121 "configure"
+#line 8211 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8128,7 +8218,7 @@ int main() {
 lirc_init()
 ; return 0; }
 EOF
-if { (eval echo configure:8132: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8183,7 +8273,7 @@ fi
       ;;
     *)
                   echo $ac_n "checking whether the byte order is big-endian""... $ac_c" 1>&6
-echo "configure:8187: checking whether the byte order is big-endian" >&5
+echo "configure:8277: checking whether the byte order is big-endian" >&5
 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -8265,7 +8355,7 @@ if test "${enable_pth+set}" = set; then
   enableval="$enable_pth"
    if test "x$enable_pth" = "xyes"; then
     echo $ac_n "checking for pth_init in -lpth""... $ac_c" 1>&6
-echo "configure:8269: checking for pth_init in -lpth" >&5
+echo "configure:8359: checking for pth_init in -lpth" >&5
 ac_lib_var=`echo pth'_'pth_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -8273,7 +8363,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lpth  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8277 "configure"
+#line 8367 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8284,7 +8374,7 @@ int main() {
 pth_init()
 ; return 0; }
 EOF
-if { (eval echo configure:8288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8312,7 +8402,7 @@ else
 fi
 
     cat > conftest.$ac_ext <<EOF
-#line 8316 "configure"
+#line 8406 "configure"
 #include "confdefs.h"
 #include <pth.h>
 EOF
@@ -8338,7 +8428,7 @@ if test "${enable_st+set}" = set; then
   enableval="$enable_st"
    if test "x$enable_st" = "xyes"; then
     echo $ac_n "checking for st_init in -lst""... $ac_c" 1>&6
-echo "configure:8342: checking for st_init in -lst" >&5
+echo "configure:8432: checking for st_init in -lst" >&5
 ac_lib_var=`echo st'_'st_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -8346,7 +8436,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lst  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8350 "configure"
+#line 8440 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8357,7 +8447,7 @@ int main() {
 st_init()
 ; return 0; }
 EOF
-if { (eval echo configure:8361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8385,7 +8475,7 @@ else
 fi
 
     cat > conftest.$ac_ext <<EOF
-#line 8389 "configure"
+#line 8479 "configure"
 #include "confdefs.h"
 #include <st.h>
 EOF
diff --git a/configure.in b/configure.in
index 8da7e2b337..30dcf0a48a 100644
--- a/configure.in
+++ b/configure.in
@@ -133,6 +133,10 @@ AC_CHECK_FUNC(connect,,[
     ipv4_LDFLAGS="${ipv4_LDFLAGS} -lsocket"
     vlc_LDFLAGS="${vlc_LDFLAGS} -lsocket"
 )])
+AC_CHECK_FUNC(send,,[
+  AC_CHECK_LIB(socket,send,
+    http_LDFLAGS="${http_LDFLAGS} -lsocket"
+)])
 AC_CHECK_FUNC(gethostbyname,,[
   AC_CHECK_LIB(nsl,gethostbyname,ipv4_LDFLAGS="${ipv4_LDFLAGS} -lnsl")
 ])
@@ -205,7 +209,7 @@ AC_EGREP_HEADER(strncasecmp,strings.h,[
             Define if <strings.h> defines strncasecmp.)])
 
 dnl Check for headers
-AC_CHECK_HEADERS(stdint.h getopt.h strings.h)
+AC_CHECK_HEADERS(stdint.h getopt.h strings.h inttypes.h sys/int_types.h)
 AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/types.h sys/time.h sys/times.h)
 AC_CHECK_HEADERS(dlfcn.h image.h)
 AC_CHECK_HEADERS(arpa/inet.h net/if.h netinet/in.h sys/socket.h)
diff --git a/include/defs.h.in b/include/defs.h.in
index ca5075311b..6dcecf55ed 100644
--- a/include/defs.h.in
+++ b/include/defs.h.in
@@ -217,6 +217,9 @@
 /* Define if you have the <image.h> header file.  */
 #undef HAVE_IMAGE_H
 
+/* Define if you have the <inttypes.h> header file.  */
+#undef HAVE_INTTYPES_H
+
 /* Define if you have the <kernel/OS.h> header file.  */
 #undef HAVE_KERNEL_OS_H
 
@@ -280,6 +283,9 @@
 /* Define if you have the <strings.h> header file.  */
 #undef HAVE_STRINGS_H
 
+/* Define if you have the <sys/int_types.h> header file.  */
+#undef HAVE_SYS_INT_TYPES_H
+
 /* Define if you have the <sys/param.h> header file.  */
 #undef HAVE_SYS_PARAM_H
 
diff --git a/plugins/a52/a52.c b/plugins/a52/a52.c
index 89815730b4..ed8d55c185 100644
--- a/plugins/a52/a52.c
+++ b/plugins/a52/a52.c
@@ -4,7 +4,7 @@
  *   (http://liba52.sf.net/).
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: a52.c,v 1.16 2002/06/01 12:31:58 sam Exp $
+ * $Id: a52.c,v 1.17 2002/06/01 16:45:34 sam Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *      
@@ -26,18 +26,20 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
-#include <string.h>                                              /* strdup() */
-#include <inttypes.h>                                          /* int16_t .. */
-
 #include <vlc/vlc.h>
 #include <vlc/aout.h>
 #include <vlc/decoder.h>
 
+#include <stdlib.h>                                      /* malloc(), free() */
+#include <string.h>                                              /* strdup() */
+#ifdef HAVE_INTTYPES_H
+#   include <inttypes.h>                                       /* int16_t .. */
+#endif
+
 #ifdef USE_A52DEC_TREE                                 /* liba52 header file */
-#include "include/a52.h"
+#   include "include/a52.h"
 #else
-#include "a52dec/a52.h"
+#   include "a52dec/a52.h"
 #endif
 
 #include "a52.h"
diff --git a/plugins/chroma/i420_yuy2.c b/plugins/chroma/i420_yuy2.c
index ff28aa8e31..ad0f379bb7 100644
--- a/plugins/chroma/i420_yuy2.c
+++ b/plugins/chroma/i420_yuy2.c
@@ -2,7 +2,7 @@
  * i420_yuy2.c : YUV to YUV conversion module for vlc
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: i420_yuy2.c,v 1.8 2002/06/01 12:31:58 sam Exp $
+ * $Id: i420_yuy2.c,v 1.9 2002/06/01 16:45:34 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -58,6 +58,11 @@ static void I420_cyuv           ( vout_thread_t *, picture_t *, picture_t * );
 static void I420_Y211           ( vout_thread_t *, picture_t *, picture_t * );
 #endif
 
+#ifdef MODULE_NAME_IS_chroma_i420_yuy2_mmx
+static unsigned long long i_00ffw;
+static unsigned long long i_80w;
+#endif
+
 /*****************************************************************************
  * Build configuration tree.
  *****************************************************************************/
@@ -72,6 +77,9 @@ MODULE_INIT_START
     SET_DESCRIPTION( _("MMX conversions from " SRC_FOURCC " to " DEST_FOURCC) )
     ADD_CAPABILITY( CHROMA, 100 )
     ADD_REQUIREMENT( MMX )
+    /* Initialize MMX-specific constants */
+    i_00ffw = 0x00ff00ff00ff00ff;
+    i_80w   = 0x0000000080808080;
 #endif
 MODULE_INIT_STOP
 
diff --git a/plugins/chroma/i420_yuy2.h b/plugins/chroma/i420_yuy2.h
index 9a16169d76..b50c0bcdec 100644
--- a/plugins/chroma/i420_yuy2.h
+++ b/plugins/chroma/i420_yuy2.h
@@ -2,7 +2,7 @@
  * i420_yuy2.h : YUV to YUV conversion module for vlc
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: i420_yuy2.h,v 1.9 2002/06/01 13:52:24 sam Exp $
+ * $Id: i420_yuy2.h,v 1.10 2002/06/01 16:45:34 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -23,11 +23,6 @@
 
 #ifdef MODULE_NAME_IS_chroma_i420_yuy2_mmx
 
-#define UNUSED_LONGLONG(foo) \
-    unsigned long long foo __asm__ (#foo) __attribute__((unused))
-UNUSED_LONGLONG(woo_00ffw) = 0x00ff00ff00ff00ff;
-UNUSED_LONGLONG(woo_80w)   = 0x0000000080808080;
-
 #define MMX_CALL(MMX_INSTRUCTIONS)                                          \
     do {                                                                    \
     __asm__ __volatile__(                                                   \
@@ -100,17 +95,17 @@ movq       (%2), %%mm0  # Load 8 Y            y7 y6 y5 y4 y3 y2 y1 y0     \n\
 movq       (%3), %%mm1  # Load 8 Y            Y7 Y6 Y5 Y4 Y3 Y2 Y1 Y0     \n\
 movd       (%4), %%mm2  # Load 4 Cb           00 00 00 00 u3 u2 u1 u0     \n\
 movd       (%5), %%mm3  # Load 4 Cr           00 00 00 00 v3 v2 v1 v0     \n\
-pand  woo_00ffw, %%mm0  # get Y even          00 Y6 00 Y4 00 Y2 00 Y0     \n\
+pand    i_00ffw, %%mm0  # get Y even          00 Y6 00 Y4 00 Y2 00 Y0     \n\
 packuswb  %%mm0, %%mm0  # pack Y              y6 y4 y2 y0 y6 y4 y2 y0     \n\
-pand  woo_00ffw, %%mm2  # get U even          00 u6 00 u4 00 u2 00 u0     \n\
+pand    i_00ffw, %%mm2  # get U even          00 u6 00 u4 00 u2 00 u0     \n\
 packuswb  %%mm2, %%mm2  # pack U              00 00 u2 u0 00 00 u2 u0     \n\
-pand  woo_00ffw, %%mm3  # get V even          00 v6 00 v4 00 v2 00 v0     \n\
+pand    i_00ffw, %%mm3  # get V even          00 v6 00 v4 00 v2 00 v0     \n\
 packuswb  %%mm3, %%mm3  # pack V              00 00 v2 v0 00 00 v2 v0     \n\
 punpcklbw %%mm3, %%mm2  #                     00 00 00 00 v2 u2 v0 u0     \n\
-psubsw  woo_80w, %%mm2  # U,V -= 128                                      \n\
+psubsw    i_80w, %%mm2  # U,V -= 128                                      \n\
 punpcklbw %%mm2, %%mm0  #                     v2 y6 u2 y4 v0 y2 u0 y0     \n\
 movq      %%mm0, (%0)   # Store YUYV                                      \n\
-pand  woo_00ffw, %%mm1  # get Y even          00 Y6 00 Y4 00 Y2 00 Y0     \n\
+pand    i_00ffw, %%mm1  # get Y even          00 Y6 00 Y4 00 Y2 00 Y0     \n\
 packuswb  %%mm1, %%mm1  # pack Y              Y6 Y4 Y2 Y0 Y6 Y4 Y2 Y0     \n\
 punpcklbw %%mm2, %%mm1  #                     v2 Y6 u2 Y4 v0 Y2 u0 Y0     \n\
 movq      %%mm1, (%1)   # Store YUYV                                      \n\
diff --git a/plugins/directx/aout_directx.c b/plugins/directx/aout_directx.c
index 95deadd411..8b5e551c16 100644
--- a/plugins/directx/aout_directx.c
+++ b/plugins/directx/aout_directx.c
@@ -2,7 +2,7 @@
  * aout_directx.c: Windows DirectX audio output method
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: aout_directx.c,v 1.22 2002/06/01 12:31:58 sam Exp $
+ * $Id: aout_directx.c,v 1.23 2002/06/01 16:45:34 sam Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -44,6 +44,18 @@
 #include <initguid.h>
 DEFINE_GUID(IID_IDirectSoundNotify, 0xb0210783, 0x89cd, 0x11d0, 0xaf, 0x8, 0x0, 0xa0, 0xc9, 0x25, 0xcd, 0x16);
 
+/*****************************************************************************
+ * notification_thread_t: DirectX event thread
+ *****************************************************************************/
+typedef struct notification_thread_s
+{
+    VLC_COMMON_MEMBERS
+
+    aout_thread_t * p_aout;
+    DSBPOSITIONNOTIFY p_events[2];               /* play notification events */
+
+} notification_thread_t;
+
 /*****************************************************************************
  * aout_sys_t: directx audio output method descriptor
  *****************************************************************************
@@ -75,28 +87,23 @@ struct aout_sys_s
 
     vlc_mutex_t buffer_lock;                            /* audio buffer lock */
 
-    vlc_thread_t notification_thread_id;             /* DirectSoundThread id */
-
-    DSBPOSITIONNOTIFY notification_events[2];    /* play notification events */
-
-    vlc_bool_t b_notification_thread_die;         /* flag to kill the thread */
+    notification_thread_t * p_notif;                 /* DirectSoundThread id */
 };
 
 /*****************************************************************************
  * Local prototypes.
  *****************************************************************************/
-static int     aout_Open        ( aout_thread_t *p_aout );
-static int     aout_SetFormat   ( aout_thread_t *p_aout );
-static int     aout_GetBufInfo  ( aout_thread_t *p_aout, int i_buffer_info );
-static void    aout_Play        ( aout_thread_t *p_aout,
-                                  byte_t *buffer, int i_size );
-static void    aout_Close       ( aout_thread_t *p_aout );
+static int     aout_Open        ( aout_thread_t * );
+static int     aout_SetFormat   ( aout_thread_t * );
+static int     aout_GetBufInfo  ( aout_thread_t *, int );
+static void    aout_Play        ( aout_thread_t *, byte_t *, int );
+static void    aout_Close       ( aout_thread_t * );
 
 /* local functions */
-static int  DirectxCreateSecondaryBuffer ( aout_thread_t *p_aout );
-static void DirectxDestroySecondaryBuffer( aout_thread_t *p_aout );
-static int  DirectxInitDSound            ( aout_thread_t *p_aout );
-static void DirectSoundThread            ( aout_thread_t *p_aout );
+static int  DirectxCreateSecondaryBuffer ( aout_thread_t * );
+static void DirectxDestroySecondaryBuffer( aout_thread_t * );
+static int  DirectxInitDSound            ( aout_thread_t * );
+static void DirectSoundThread            ( notification_thread_t * );
 
 /*****************************************************************************
  * Functions exported as capabilities. They are declared as static so that
@@ -137,10 +144,9 @@ static int aout_Open( aout_thread_t *p_aout )
     p_aout->p_sys->p_dsbuffer_primary = NULL;
     p_aout->p_sys->p_dsbuffer = NULL;
     p_aout->p_sys->p_dsnotify = NULL;
-    p_aout->p_sys->b_notification_thread_die = 0;
     p_aout->p_sys->l_data_written_from_beginning = 0;
     p_aout->p_sys->l_data_played_from_beginning = 0;
-    vlc_mutex_init( &p_aout->p_sys->buffer_lock );
+    vlc_mutex_init( p_aout, &p_aout->p_sys->buffer_lock );
 
 
     /* Initialise DirectSound */
@@ -172,21 +178,25 @@ static int aout_Open( aout_thread_t *p_aout )
     /* Now we need to setup DirectSound play notification */
 
     /* first we need to create the notification events */
-    p_aout->p_sys->notification_events[0].hEventNotify =
+    p_aout->p_sys->p_notif->p_events[0].hEventNotify =
         CreateEvent( NULL, FALSE, FALSE, NULL );
-    p_aout->p_sys->notification_events[1].hEventNotify =
+    p_aout->p_sys->p_notif->p_events[1].hEventNotify =
         CreateEvent( NULL, FALSE, FALSE, NULL );
 
     /* then launch the notification thread */
     msg_Dbg( p_aout, "creating DirectSoundThread" );
-    if( vlc_thread_create( p_aout, &p_aout->p_sys->notification_thread_id,
-                           "DirectSound Notification Thread",
-                           (void *) DirectSoundThread, (void *) p_aout) )
+    p_aout->p_sys->p_notif =
+                vlc_object_create( p_aout, sizeof(notification_thread_t) );
+    p_aout->p_sys->p_notif->p_aout = p_aout;
+    if( vlc_thread_create( p_aout->p_sys->p_notif,
+                    "DirectSound Notification Thread", DirectSoundThread, 1 ) )
     {
         msg_Err( p_aout, "cannot create DirectSoundThread" );
         /* Let's go on anyway */
     }
 
+    vlc_object_attach( p_aout->p_sys->p_notif, p_aout );
+
     return( 0 );
 }
 
@@ -424,11 +434,14 @@ static void aout_Close( aout_thread_t *p_aout )
 
     msg_Dbg( p_aout, "aout_Close" );
 
-    /* kill the position notification thread */
-    p_aout->p_sys->b_notification_thread_die = 1;
-    SetEvent( p_aout->p_sys->notification_events[0].hEventNotify );
-    vlc_thread_join( p_aout, p_aout->p_sys->notification_thread_id );
-    vlc_mutex_destroy( &p_aout->p_sys->buffer_lock );
+    /* kill the position notification thread, if any */
+    vlc_object_unlink_all( p_aout->p_sys->p_notif );
+    if( p_aout->p_sys->p_notif->b_thread )
+    {
+        p_aout->p_sys->p_notif->b_die = 1;
+        vlc_thread_join( p_aout->p_sys->p_notif );
+    }
+    vlc_object_destroy( p_aout->p_sys->p_notif );
 
     /* release the secondary buffer */
     DirectxDestroySecondaryBuffer( p_aout );
@@ -578,8 +591,8 @@ static int DirectxCreateSecondaryBuffer( aout_thread_t *p_aout )
 
     /* Now the secondary buffer is created, we need to setup its position
      * notification */
-    p_aout->p_sys->notification_events[0].dwOffset = 0;    /* notif position */
-    p_aout->p_sys->notification_events[1].dwOffset = dsbcaps.dwBufferBytes / 2;
+    p_aout->p_sys->p_notif->p_events[0].dwOffset = 0;    /* notif position */
+    p_aout->p_sys->p_notif->p_events[1].dwOffset = dsbcaps.dwBufferBytes / 2;
 
     /* Get the IDirectSoundNotify interface */
     if FAILED( IDirectSoundBuffer_QueryInterface( p_aout->p_sys->p_dsbuffer,
@@ -595,7 +608,7 @@ static int DirectxCreateSecondaryBuffer( aout_thread_t *p_aout )
     if FAILED( IDirectSoundNotify_SetNotificationPositions(
                                         p_aout->p_sys->p_dsnotify,
                                         2,
-                                        p_aout->p_sys->notification_events ) )
+                                        p_aout->p_sys->p_notif->p_events ) )
     {
         msg_Warn( p_aout, "cannot set position Notification" );
         /* Go on anyway */
@@ -638,7 +651,7 @@ static void DirectxDestroySecondaryBuffer( aout_thread_t *p_aout )
  * Using event notification implies blocking the thread until the event is
  * signaled so we really need to run this in a separate thread.
  *****************************************************************************/
-static void DirectSoundThread( aout_thread_t *p_aout )
+static void DirectSoundThread( notification_thread_t *p_notif )
 {
     HANDLE  notification_events[2];
     VOID    *p_write_position, *p_start_buffer;
@@ -646,26 +659,32 @@ static void DirectSoundThread( aout_thread_t *p_aout )
     HRESULT dsresult;
     long    l_buffer_size, l_play_position, l_data_in_buffer;
 
-    notification_events[0]=p_aout->p_sys->notification_events[0].hEventNotify;
-    notification_events[1]=p_aout->p_sys->notification_events[1].hEventNotify;
+    aout_thread_t *p_aout = p_notif->p_aout;
+
+#define P_EVENTS p_aout->p_sys->p_notif->p_events
+    notification_events[0] = P_EVENTS[0].hEventNotify;
+    notification_events[1] = P_EVENTS[1].hEventNotify;
+
+    /* Tell the main thread that we are ready */
+    vlc_thread_ready( p_notif );
 
     /* this thread must be high-priority */
     if( !SetThreadPriority( GetCurrentThread(),
                             THREAD_PRIORITY_ABOVE_NORMAL ) )
     {
-        msg_Warn( p_aout, "DirectSoundThread could not renice itself" );
+        msg_Warn( p_notif, "DirectSoundThread could not renice itself" );
     }
 
-    msg_Dbg( p_aout, "DirectSoundThread ready" );
+    msg_Dbg( p_notif, "DirectSoundThread ready" );
 
-    while( !p_aout->p_sys->b_notification_thread_die )
+    while( !p_notif->b_die )
     {
         /* wait for the position notification */
         l_play_position = WaitForMultipleObjects( 2, notification_events,
                                                   0, INFINITE ); 
         vlc_mutex_lock( &p_aout->p_sys->buffer_lock );
 
-        if( p_aout->p_sys->b_notification_thread_die )
+        if( p_notif->b_die )
         {
             break;
         }
@@ -680,15 +699,15 @@ static void DirectSoundThread( aout_thread_t *p_aout )
         /* detect wrap-around */
         if( l_data_in_buffer < (-l_buffer_size/2) )
         {
-            msg_Dbg( p_aout, "DirectSoundThread wrap around: %li",
-                             l_data_in_buffer );
+            msg_Dbg( p_notif, "DirectSoundThread wrap around: %li",
+                              l_data_in_buffer );
             l_data_in_buffer += l_buffer_size;
         }
 
         /* detect underflow */
         if( l_data_in_buffer <= 0 )
         {
-            msg_Warn( p_aout,
+            msg_Warn( p_notif,
                       "DirectSoundThread underflow: %li", l_data_in_buffer );
             p_aout->p_sys->b_buffer_underflown = 1;
             p_aout->p_sys->l_write_position =
@@ -723,7 +742,7 @@ static void DirectSoundThread( aout_thread_t *p_aout )
         }
         if( dsresult != DS_OK )
         {
-            msg_Warn( p_aout, "aout_Play cannot lock buffer" );
+            msg_Warn( p_notif, "aout_Play cannot lock buffer" );
             vlc_mutex_unlock( &p_aout->p_sys->buffer_lock );
             return;
         }
@@ -747,6 +766,6 @@ static void DirectSoundThread( aout_thread_t *p_aout )
     CloseHandle( notification_events[0] );
     CloseHandle( notification_events[1] );
 
-    msg_Dbg( p_aout, "DirectSoundThread exiting" );
+    msg_Dbg( p_notif, "DirectSoundThread exiting" );
 
 }
diff --git a/plugins/directx/vout_directx.c b/plugins/directx/vout_directx.c
index 976c7a6d5e..df46bad904 100644
--- a/plugins/directx/vout_directx.c
+++ b/plugins/directx/vout_directx.c
@@ -2,7 +2,7 @@
  * vout_directx.c: Windows DirectX video output display method
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: vout_directx.c,v 1.37 2002/06/01 12:31:58 sam Exp $
+ * $Id: vout_directx.c,v 1.38 2002/06/01 16:45:34 sam Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -122,7 +122,6 @@ static int vout_Create( vout_thread_t *p_vout )
     p_vout->p_sys->hbrush = NULL;
     p_vout->p_sys->hwnd = NULL;
     p_vout->p_sys->i_changes = 0;
-    p_vout->p_sys->b_event_thread_die = 0;
     p_vout->p_sys->b_caps_overlay_clipping = 0;
     SetRectEmpty( &p_vout->p_sys->rect_display );
     p_vout->p_sys->b_using_overlay = config_GetInt( p_vout, "overlay" );
@@ -136,11 +135,6 @@ static int vout_Create( vout_thread_t *p_vout )
     p_vout->p_sys->i_window_width = p_vout->i_window_width;
     p_vout->p_sys->i_window_height = p_vout->i_window_height;
 
-    /* Set locks and condition variables */
-    vlc_mutex_init( p_vout, &p_vout->p_sys->event_thread_lock );
-    vlc_cond_init( &p_vout->p_sys->event_thread_wait );
-    p_vout->p_sys->i_event_thread_status = THREAD_CREATE;
-
     /* Create the DirectXEventThread, this thread is created by us to isolate
      * the Win32 PeekMessage function calls. We want to do this because
      * Windows can stay blocked inside this call for a long time, and when
@@ -149,32 +143,30 @@ static int vout_Create( vout_thread_t *p_vout )
      * window (because PeekMessage has to be called from the same thread which
      * created the window). */
     msg_Dbg( p_vout, "creating DirectXEventThread" );
-    if( vlc_thread_create( p_vout, &p_vout->p_sys->event_thread_id,
-                           "DirectX Events Thread",
-                           (void *) DirectXEventThread, (void *) p_vout) )
+    p_vout->p_sys->p_event = vlc_object_create( p_vout, sizeof(event_thread_t) );
+    p_vout->p_sys->p_event->p_vout = p_vout;
+    if( vlc_thread_create( p_vout->p_sys->p_event,
+                           "DirectX Events Thread", DirectXEventThread, 1 ) )
     {
         msg_Err( p_vout, "cannot create DirectXEventThread" );
+        vlc_object_destroy( p_vout->p_sys->p_event );
         free( p_vout->p_sys );
         return( 1 );
     }
 
-    /* We need to wait for the actual creation of the thread and window */
-    vlc_mutex_lock( &p_vout->p_sys->event_thread_lock );
-    if( p_vout->p_sys->i_event_thread_status == THREAD_CREATE )
-    {
-        vlc_cond_wait ( &p_vout->p_sys->event_thread_wait,
-                        &p_vout->p_sys->event_thread_lock );
-    }
-    vlc_mutex_unlock( &p_vout->p_sys->event_thread_lock );
-    if( p_vout->p_sys->i_event_thread_status != THREAD_READY )
+    if( p_vout->p_sys->p_event->b_error )
     {
         msg_Err( p_vout, "DirectXEventThread failed" );
+        p_vout->p_sys->p_event->b_die = 1;
+        vlc_thread_join( p_vout->p_sys->p_event );
+        vlc_object_destroy( p_vout->p_sys->p_event );
         free( p_vout->p_sys );
         return( 1 );
     }
 
-    msg_Dbg( p_vout, "DirectXEventThread running" );
+    vlc_object_attach( p_vout->p_sys->p_event, p_vout );
 
+    msg_Dbg( p_vout, "DirectXEventThread running" );
 
     /* Initialise DirectDraw */
     if( DirectXInitDDraw( p_vout ) )
@@ -253,17 +245,20 @@ static void vout_Destroy( vout_thread_t *p_vout )
     DirectXCloseDisplay( p_vout );
     DirectXCloseDDraw( p_vout );
 
+    vlc_object_unlink_all( p_vout->p_sys->p_event );
+
     /* Kill DirectXEventThread */
-    vlc_mutex_lock( &p_vout->p_sys->event_thread_lock );
-    p_vout->p_sys->b_event_thread_die = 1;
+    p_vout->p_sys->p_event->b_die = 1;
 
     /* we need to be sure DirectXEventThread won't stay stuck in GetMessage,
      * so we send a fake message */
     if( p_vout->p_sys->hwnd )
+    {
         PostMessage( p_vout->p_sys->hwnd, WM_NULL, 0, 0);
+    }
 
-    vlc_mutex_unlock( &p_vout->p_sys->event_thread_lock );
-    vlc_thread_join( p_vout->p_sys->event_thread_id );
+    vlc_thread_join( p_vout->p_sys->p_event );
+    vlc_object_destroy( p_vout->p_sys->p_event );
 
     if( p_vout->p_sys != NULL )
     {
@@ -363,7 +358,7 @@ static int vout_Manage( vout_thread_t *p_vout )
     }
 
     /* Check if the event thread is still running */
-    if( p_vout->p_sys->b_event_thread_die )
+    if( p_vout->p_sys->p_event->b_die )
         return 1; /* exit */
 
     return( 0 );
@@ -739,7 +734,7 @@ static int DirectXCreateSurface( vout_thread_t *p_vout,
 
     if( !b_overlay )
     {
-        boolean_t b_rgb_surface = ( i_chroma == FOURCC_RGB2 ) ||
+        vlc_bool_t b_rgb_surface = ( i_chroma == FOURCC_RGB2 ) ||
             ( i_chroma == FOURCC_RV15 ) || ( i_chroma == FOURCC_RV16 ) ||
             ( i_chroma == FOURCC_RV24 ) || ( i_chroma == FOURCC_RV32 );
 
@@ -904,7 +899,7 @@ static int NewPictureVec( vout_thread_t *p_vout, picture_t *p_pic,
                           int i_num_pics )
 {
     int i;
-    boolean_t b_result_ok;
+    vlc_bool_t b_result_ok;
     LPDIRECTDRAWSURFACE3 p_surface;
 
     msg_Dbg( p_vout, "NewPictureVec" );
@@ -1081,11 +1076,10 @@ static int NewPictureVec( vout_thread_t *p_vout, picture_t *p_pic,
 
             I_OUTPUTPICTURES = 1;
 
-            intf_WarnMsg( 3, "vout: DirectX plain surface created "
-                             "successfully" );
+            msg_Dbg( p_vout, "DirectX plain surface created successfully" );
         }
         else
-            intf_ErrMsg( "vout error: DirectX can't create plain surface." );
+            msg_Err( p_vout, "DirectX could not create plain surface" );
     }
 
 
diff --git a/plugins/directx/vout_directx.h b/plugins/directx/vout_directx.h
index bf5280806c..e4dea68331 100644
--- a/plugins/directx/vout_directx.h
+++ b/plugins/directx/vout_directx.h
@@ -2,7 +2,7 @@
  * vout_directx.h: Windows DirectX video output header file
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: vout_directx.h,v 1.7 2002/06/01 12:31:58 sam Exp $
+ * $Id: vout_directx.h,v 1.8 2002/06/01 16:45:34 sam Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -21,6 +21,17 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
+/*****************************************************************************
+ * event_thread_t: DirectX event thread
+ *****************************************************************************/
+typedef struct event_thread_s
+{
+    VLC_COMMON_MEMBERS
+
+    vout_thread_t * p_vout;
+
+} event_thread_t;
+
 /*****************************************************************************
  * vout_sys_t: video output DirectX method descriptor
  *****************************************************************************
@@ -29,7 +40,6 @@
  *****************************************************************************/
 struct vout_sys_s
 {
-
     LPDIRECTDRAW2        p_ddobject;                    /* DirectDraw object */
     LPDIRECTDRAWSURFACE3 p_display;                        /* Display device */
     LPDIRECTDRAWSURFACE3 p_current_surface;   /* surface currently displayed */
@@ -70,9 +80,7 @@ struct vout_sys_s
     volatile vlc_bool_t b_cursor_hidden;
     volatile mtime_t    i_lastmoved;
 
-    vlc_thread_t event_thread_id;                            /* event thread */
-    vlc_mutex_t  event_thread_lock;             /* lock for the event thread */
-    vlc_cond_t   event_thread_wait;
+    event_thread_t *    p_event;
 
     volatile int i_event_thread_status;         /* DirectXEventThread status */
     volatile vlc_bool_t b_event_thread_die; /* flag to kill the event thread */
@@ -98,7 +106,7 @@ struct picture_sys_s
 /*****************************************************************************
  * Prototypes from vout_events.c
  *****************************************************************************/
-void DirectXEventThread ( vout_thread_t *p_vout );
+void DirectXEventThread ( event_thread_t *p_event );
 void DirectXUpdateOverlay( vout_thread_t *p_vout );
 
 /*****************************************************************************
diff --git a/plugins/directx/vout_events.c b/plugins/directx/vout_events.c
index f4f239fa49..a7b8943fa5 100644
--- a/plugins/directx/vout_events.c
+++ b/plugins/directx/vout_events.c
@@ -2,7 +2,7 @@
  * vout_events.c: Windows DirectX video output events handler
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: vout_events.c,v 1.19 2002/06/01 12:31:58 sam Exp $
+ * $Id: vout_events.c,v 1.20 2002/06/01 16:45:34 sam Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -61,7 +61,7 @@ static long FAR PASCAL DirectXEventProc ( HWND hwnd, UINT message,
  * The main goal of this thread is to isolate the Win32 PeekMessage function
  * because this one can block for a long time.
  *****************************************************************************/
-void DirectXEventThread( vout_thread_t *p_vout )
+void DirectXEventThread( event_thread_t *p_event )
 {
     MSG msg;
     POINT old_mouse_pos;
@@ -71,27 +71,22 @@ void DirectXEventThread( vout_thread_t *p_vout )
     /* Create a window for the video */
     /* Creating a window under Windows also initializes the thread's event
      * message qeue */
-    vlc_mutex_lock( &p_vout->p_sys->event_thread_lock );
-    if( DirectXCreateWindow( p_vout ) )
+    if( DirectXCreateWindow( p_event->p_vout ) )
     {
-        msg_Err( p_vout, "out of memory" );
-        p_vout->p_sys->i_event_thread_status = THREAD_FATAL;
-        p_vout->p_sys->b_event_thread_die = 1;
+        msg_Err( p_event, "out of memory" );
+        p_event->b_dead = 1;
     }
-    else p_vout->p_sys->i_event_thread_status = THREAD_READY;
 
     /* signal the creation of the window */
-    vlc_cond_signal( &p_vout->p_sys->event_thread_wait );
-    vlc_mutex_unlock( &p_vout->p_sys->event_thread_lock );
+    vlc_thread_ready( p_event );
 
     /* Main loop */
     /* GetMessage will sleep if there's no message in the queue */
-    while( !p_vout->p_sys->b_event_thread_die
-           && GetMessage( &msg, p_vout->p_sys->hwnd, 0, 0 ) )
+    while( !p_event->b_die
+           && GetMessage( &msg, p_event->p_vout->p_sys->hwnd, 0, 0 ) )
     {
-
         /* Check if we are asked to exit */
-        if( p_vout->b_die || p_vout->p_sys->b_event_thread_die )
+        if( p_event->b_die )
             break;
 
         switch( msg.message )
@@ -103,11 +98,11 @@ void DirectXEventThread( vout_thread_t *p_vout )
                 (abs(GET_Y_LPARAM(msg.lParam) - old_mouse_pos.y)) > 2 ) )
             {
                 GetCursorPos( &old_mouse_pos );
-                p_vout->p_sys->i_lastmoved = mdate();
+                p_event->p_vout->p_sys->i_lastmoved = mdate();
 
-                if( p_vout->p_sys->b_cursor_hidden )
+                if( p_event->p_vout->p_sys->b_cursor_hidden )
                 {
-                    p_vout->p_sys->b_cursor_hidden = 0;
+                    p_event->p_vout->p_sys->b_cursor_hidden = 0;
                     ShowCursor( TRUE );
                 }
             }
@@ -119,27 +114,36 @@ void DirectXEventThread( vout_thread_t *p_vout )
             break;
 
         case WM_RBUTTONUP:
-            p_vout->p_vlc->p_intf->b_menu_change = 1;
+            {
+                intf_thread_t *p_intf;
+                p_intf = vlc_object_find( p_event->p_vlc, VLC_OBJECT_INTF,
+                                                          FIND_CHILD );
+                if( p_intf )
+                {
+                    p_intf->b_menu_change = 1;
+                    vlc_object_release( p_intf );
+                }
+            }
             break;
 
         case WM_LBUTTONDOWN:
             break;
 
         case WM_LBUTTONDBLCLK:
-            p_vout->p_sys->i_changes |= VOUT_FULLSCREEN_CHANGE;
+            p_event->p_vout->p_sys->i_changes |= VOUT_FULLSCREEN_CHANGE;
             break;
 
         case WM_KEYDOWN:
             /* the key events are first processed here. The next
              * message processed by this main message loop will be the
              * char translation of the key event */
-            msg_Dbg( p_vout, "WM_KEYDOWN" );
+            msg_Dbg( p_event, "WM_KEYDOWN" );
             switch( msg.wParam )
             {
             case VK_ESCAPE:
             case VK_F12:
                 /* exit application */
-                p_vout->p_vlc->b_die = 1;
+                p_event->p_vlc->b_die = 1;
                 break;
             }
             TranslateMessage(&msg);
@@ -151,47 +155,47 @@ void DirectXEventThread( vout_thread_t *p_vout )
             case 'q':
             case 'Q':
                 /* exit application */
-                p_vout->p_vlc->b_die = 1;
+                p_event->p_vlc->b_die = 1;
                 break;
 
             case 'f':                            /* switch to fullscreen */
             case 'F':
-                p_vout->p_sys->i_changes |= VOUT_FULLSCREEN_CHANGE;
+                p_event->p_vout->p_sys->i_changes |= VOUT_FULLSCREEN_CHANGE;
                 break;
 
             case 'c':                                /* toggle grayscale */
             case 'C':
-                p_vout->b_grayscale = ! p_vout->b_grayscale;
-                p_vout->p_sys->i_changes |= VOUT_GRAYSCALE_CHANGE;
+                p_event->p_vout->b_grayscale = ! p_event->p_vout->b_grayscale;
+                p_event->p_vout->p_sys->i_changes |= VOUT_GRAYSCALE_CHANGE;
                 break;
 
             case 'i':                                     /* toggle info */
             case 'I':
-                p_vout->b_info = ! p_vout->b_info;
-                p_vout->p_sys->i_changes |= VOUT_INFO_CHANGE;
+                p_event->p_vout->b_info = ! p_event->p_vout->b_info;
+                p_event->p_vout->p_sys->i_changes |= VOUT_INFO_CHANGE;
                 break;
 
             case 's':                                  /* toggle scaling */
             case 'S':
-                p_vout->b_scale = ! p_vout->b_scale;
-                p_vout->p_sys->i_changes |= VOUT_SCALE_CHANGE;
+                p_event->p_vout->b_scale = ! p_event->p_vout->b_scale;
+                p_event->p_vout->p_sys->i_changes |= VOUT_SCALE_CHANGE;
                 break;
 
             case ' ':                                /* toggle interface */
-                p_vout->b_interface = ! p_vout->b_interface;
-                p_vout->p_sys->i_changes |= VOUT_INTF_CHANGE;
+                p_event->p_vout->b_interface = ! p_event->p_vout->b_interface;
+                p_event->p_vout->p_sys->i_changes |= VOUT_INTF_CHANGE;
                 break;
 
-            case '0': network_ChannelJoin( p_vout->p_this, 0 ); break;
-            case '1': network_ChannelJoin( p_vout->p_this, 1 ); break;
-            case '2': network_ChannelJoin( p_vout->p_this, 2 ); break;
-            case '3': network_ChannelJoin( p_vout->p_this, 3 ); break;
-            case '4': network_ChannelJoin( p_vout->p_this, 4 ); break;
-            case '5': network_ChannelJoin( p_vout->p_this, 5 ); break;
-            case '6': network_ChannelJoin( p_vout->p_this, 6 ); break;
-            case '7': network_ChannelJoin( p_vout->p_this, 7 ); break;
-            case '8': network_ChannelJoin( p_vout->p_this, 8 ); break;
-            case '9': network_ChannelJoin( p_vout->p_this, 9 ); break;
+            case '0': network_ChannelJoin( p_event->p_this, 0 ); break;
+            case '1': network_ChannelJoin( p_event->p_this, 1 ); break;
+            case '2': network_ChannelJoin( p_event->p_this, 2 ); break;
+            case '3': network_ChannelJoin( p_event->p_this, 3 ); break;
+            case '4': network_ChannelJoin( p_event->p_this, 4 ); break;
+            case '5': network_ChannelJoin( p_event->p_this, 5 ); break;
+            case '6': network_ChannelJoin( p_event->p_this, 6 ); break;
+            case '7': network_ChannelJoin( p_event->p_this, 7 ); break;
+            case '8': network_ChannelJoin( p_event->p_this, 8 ); break;
+            case '9': network_ChannelJoin( p_event->p_this, 9 ); break;
 
             default:
                 break;
@@ -210,16 +214,16 @@ void DirectXEventThread( vout_thread_t *p_vout )
 
     if( msg.message == WM_QUIT )
     {
-        msg_Warn( p_vout, "WM_QUIT... should not happen!!" );
-        p_vout->p_sys->hwnd = NULL; /* Window already destroyed */
+        msg_Warn( p_event, "WM_QUIT... should not happen!!" );
+        p_event->p_vout->p_sys->hwnd = NULL; /* Window already destroyed */
     }
 
-    msg_Dbg( p_vout, "DirectXEventThread Terminating" );
+    msg_Dbg( p_event, "DirectXEventThread Terminating" );
 
     /* clear the changes formerly signaled */
-    p_vout->p_sys->i_changes = 0;
+    p_event->p_vout->p_sys->i_changes = 0;
 
-    DirectXCloseWindow( p_vout );
+    DirectXCloseWindow( p_event->p_vout );
 }
 
 
@@ -376,18 +380,12 @@ static void DirectXCloseWindow( vout_thread_t *p_vout )
 {
     msg_Dbg( p_vout, "DirectXCloseWindow" );
 
-    vlc_mutex_lock( &p_vout->p_sys->event_thread_lock );
-
     if( p_vout->p_sys->hwnd != NULL )
     {
         DestroyWindow( p_vout->p_sys->hwnd );
         p_vout->p_sys->hwnd = NULL;
     }
 
-    p_vout->p_sys->i_event_thread_status = THREAD_OVER;
-
-    vlc_mutex_unlock( &p_vout->p_sys->event_thread_lock );
-
     /* We don't unregister the Window Class because it could lead to race
      * conditions and it will be done anyway by the system when the app will
      * exit */
diff --git a/plugins/dummy/intf_dummy.c b/plugins/dummy/intf_dummy.c
index f7bd63b762..db171b4e25 100644
--- a/plugins/dummy/intf_dummy.c
+++ b/plugins/dummy/intf_dummy.c
@@ -2,7 +2,7 @@
  * intf_dummy.c: dummy interface plugin
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: intf_dummy.c,v 1.18 2002/06/01 12:31:58 sam Exp $
+ * $Id: intf_dummy.c,v 1.19 2002/06/01 16:45:34 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -74,8 +74,8 @@ static int intf_Open( intf_thread_t *p_intf )
     freopen( "CONOUT$", "w", stdout );
     freopen( "CONOUT$", "w", stderr );
     freopen( "CONIN$", "r", stdin );
-    intf_Msg( VERSION_MESSAGE );
-    intf_Msg( _("\nUsing the dummy interface plugin...") );
+    msg_Info( p_intf, VERSION_MESSAGE );
+    msg_Info( p_intf, _("\nUsing the dummy interface plugin...") );
 #endif
 
     return( 0 );
diff --git a/plugins/idct/idctaltivec.c b/plugins/idct/idctaltivec.c
index 787ce53396..de0796539e 100644
--- a/plugins/idct/idctaltivec.c
+++ b/plugins/idct/idctaltivec.c
@@ -2,7 +2,7 @@
  * idctaltivec.c : AltiVec IDCT module
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: idctaltivec.c,v 1.25 2002/06/01 12:31:59 sam Exp $
+ * $Id: idctaltivec.c,v 1.26 2002/06/01 16:45:34 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -26,12 +26,14 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>
-#include <string.h>
-#include <inttypes.h>
-
 #include <vlc/vlc.h>
 
+#include <stdlib.h>                                      /* malloc(), free() */
+#include <string.h>
+#ifdef HAVE_INTTYPES_H
+#   include <inttypes.h>                                       /* int16_t .. */
+#endif
+
 #include "idct.h"
 
 /*****************************************************************************
diff --git a/plugins/motion/motionaltivec.c b/plugins/motion/motionaltivec.c
index 7fc281decd..4d5224ffa8 100644
--- a/plugins/motion/motionaltivec.c
+++ b/plugins/motion/motionaltivec.c
@@ -2,7 +2,7 @@
  * motionaltivec.c : AltiVec motion compensation module for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: motionaltivec.c,v 1.13 2002/06/01 12:32:00 sam Exp $
+ * $Id: motionaltivec.c,v 1.14 2002/06/01 16:45:34 sam Exp $
  *
  * Authors: Michel Lespinasse <walken@zoy.org>
  *          Paul Mackerras <paulus@linuxcare.com.au>
@@ -27,11 +27,13 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include <vlc/vlc.h>
+
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>
-#include <inttypes.h>
-
-#include <vlc/vlc.h>
+#ifdef HAVE_INTTYPES_H
+#   include <inttypes.h>                                       /* int16_t .. */
+#endif
 
 /*****************************************************************************
  * Local and extern prototypes.
diff --git a/plugins/network/ipv6.c b/plugins/network/ipv6.c
index de178fd293..d138b2b979 100644
--- a/plugins/network/ipv6.c
+++ b/plugins/network/ipv6.c
@@ -2,7 +2,7 @@
  * ipv6.c: IPv6 network abstraction layer
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: ipv6.c,v 1.9 2002/06/01 12:32:00 sam Exp $
+ * $Id: ipv6.c,v 1.10 2002/06/01 16:45:34 sam Exp $
  *
  * Authors: Alexis Guillard <alexis.guillard@bt.com>
  *          Christophe Massiot <massiot@via.ecp.fr>
@@ -66,7 +66,7 @@ static const struct in6_addr in6addr_any = {{IN6ADDR_ANY_INIT}};
  * Local prototypes
  *****************************************************************************/
 static void getfunctions( function_list_t * );
-static int  NetworkOpen( network_socket_t * );
+static int  NetworkOpen( vlc_object_t *, network_socket_t * );
 
 /*****************************************************************************
  * Build configuration tree.
@@ -125,7 +125,7 @@ static int BuildAddr( struct sockaddr_in6 * p_socket,
     }
     if( !_getaddrinfo || !_freeaddrinfo )
     {
-        intf_ErrMsg( "ipv6 error: no IPv6 stack installed" );
+//X        msg_Err( p_this, "no IPv6 stack installed" );
         if( wship6_dll ) FreeLibrary( wship6_dll );
         return( -1 );
     }
@@ -218,7 +218,7 @@ static int BuildAddr( struct sockaddr_in6 * p_socket,
  *   Its use leads to great confusion and is currently discouraged.
  * This function returns -1 in case of error.
  *****************************************************************************/
-static int OpenUDP( network_socket_t * p_socket )
+static int OpenUDP( vlc_object_t * p_this, network_socket_t * p_socket )
 {
     char * psz_bind_addr = p_socket->psz_bind_addr;
     int i_bind_port = p_socket->i_bind_port;
@@ -237,7 +237,7 @@ static int OpenUDP( network_socket_t * p_socket )
      * protocol */
     if( (i_handle = socket( AF_INET6, SOCK_DGRAM, 0 )) == -1 )
     {
-//X        intf_ErrMsg( "ipv6 error: cannot create socket (%s)", strerror(errno) );
+        msg_Err( p_this, "cannot create socket (%s)", strerror(errno) );
         return( -1 );
     }
 
@@ -246,8 +246,8 @@ static int OpenUDP( network_socket_t * p_socket )
     if( setsockopt( i_handle, SOL_SOCKET, SO_REUSEADDR,
                     (void *) &i_opt, sizeof( i_opt ) ) == -1 )
     {
-//X        intf_ErrMsg( "ipv6 error: cannot configure socket (SO_REUSEADDR: %s)",
-                     strerror(errno));
+        msg_Err( p_this, "cannot configure socket (SO_REUSEADDR: %s)",
+                         strerror(errno) );
         close( i_handle );
         return( -1 );
     }
@@ -258,9 +258,8 @@ static int OpenUDP( network_socket_t * p_socket )
     if( setsockopt( i_handle, SOL_SOCKET, SO_RCVBUF,
                     (void *) &i_opt, sizeof( i_opt ) ) == -1 )
     {
-//X        intf_WarnMsg( 1,
-                      "ipv6 warning: cannot configure socket (SO_RCVBUF: %s)",
-                      strerror(errno));
+        msg_Warn( p_this, "cannot configure socket (SO_RCVBUF: %s)",
+                          strerror(errno) );
     }
  
     /* Check if we really got what we have asked for, because Linux, etc.
@@ -271,13 +270,13 @@ static int OpenUDP( network_socket_t * p_socket )
     if( getsockopt( i_handle, SOL_SOCKET, SO_RCVBUF,
                     (void*) &i_opt, &i_opt_size ) == -1 )
     {
-//X        intf_WarnMsg( 1, "ipv6 warning: cannot query socket (SO_RCVBUF: %s)",
-//X                         strerror(errno));
+        msg_Warn( p_this, "cannot query socket (SO_RCVBUF: %s)",
+                          strerror(errno) );
     }
     else if( i_opt < 0x80000 )
     {
-//X        intf_WarnMsg( 1, "ipv6 warning: socket buffer size is 0x%x"
-                         " instead of 0x%x", i_opt, 0x80000 );
+        msg_Warn( p_this, "socket buffer size is 0x%x instead of 0x%x",
+                          i_opt, 0x80000 );
     }
     
     /* Build the local socket */
@@ -290,7 +289,7 @@ static int OpenUDP( network_socket_t * p_socket )
     /* Bind it */
     if( bind( i_handle, (struct sockaddr *)&sock, sizeof( sock ) ) < 0 )
     {
-//X        intf_ErrMsg( "ipv6 error: cannot bind socket (%s)", strerror(errno) );
+        msg_Err( p_this, "cannot bind socket (%s)", strerror(errno) );
         close( i_handle );
         return( -1 );
     }
@@ -302,9 +301,8 @@ static int OpenUDP( network_socket_t * p_socket )
         if( setsockopt( i_handle, SOL_SOCKET, SO_BROADCAST,
                         (void*) &i_opt, sizeof( i_opt ) ) == -1 )
         {
-//X            intf_WarnMsg( 1,
-//X                    "ipv6 warning: cannot configure socket (SO_BROADCAST: %s)",
-//X                    strerror(errno));
+            msg_Warn( p_this, "ipv6 warning: cannot configure socket "
+                              "(SO_BROADCAST: %s)", strerror(errno) );
         }
     }
  
@@ -316,7 +314,7 @@ static int OpenUDP( network_socket_t * p_socket )
         /* Build socket for remote connection */
         if ( BuildAddr( &sock, psz_server_addr, i_server_port ) == -1 )
         {
-//X            intf_ErrMsg( "ipv6 error: cannot build remote address" );
+            msg_Err( p_this, "cannot build remote address" );
             close( i_handle );
             return( -1 );
         }
@@ -325,8 +323,7 @@ static int OpenUDP( network_socket_t * p_socket )
         if( connect( i_handle, (struct sockaddr *) &sock,
                      sizeof( sock ) ) == (-1) )
         {
-//X            intf_ErrMsg( "ipv6 error: cannot connect socket (%s)",
-//X                         strerror(errno) );
+            msg_Err( p_this, "cannot connect socket (%s)", strerror(errno) );
             close( i_handle );
             return( -1 );
         }
@@ -345,7 +342,7 @@ static int OpenUDP( network_socket_t * p_socket )
  * Other parameters are ignored.
  * This function returns -1 in case of error.
  *****************************************************************************/
-static int OpenTCP( network_socket_t * p_socket )
+static int OpenTCP( vlc_object_t * p_this, network_socket_t * p_socket )
 {
     char * psz_server_addr = p_socket->psz_server_addr;
     int i_server_port = p_socket->i_server_port;
@@ -362,7 +359,7 @@ static int OpenTCP( network_socket_t * p_socket )
      * protocol */
     if( (i_handle = socket( AF_INET6, SOCK_STREAM, 0 )) == -1 )
     {
-//X        intf_ErrMsg( "ipv6 error: cannot create socket (%s)", strerror(errno) );
+        msg_Err( p_this, "cannot create socket (%s)", strerror(errno) );
         return( -1 );
     }
 
@@ -377,8 +374,7 @@ static int OpenTCP( network_socket_t * p_socket )
     if( connect( i_handle, (struct sockaddr *) &sock,
                  sizeof( sock ) ) == (-1) )
     {
-//X        intf_ErrMsg( "ipv6 error: cannot connect socket (%s)",
-                     strerror(errno) );
+        msg_Err( p_this, "cannot connect socket (%s)", strerror(errno) );
         close( i_handle );
         return( -1 );
     }
@@ -392,14 +388,14 @@ static int OpenTCP( network_socket_t * p_socket )
 /*****************************************************************************
  * NetworkOpen: wrapper around OpenUDP and OpenTCP
  *****************************************************************************/
-static int NetworkOpen( network_socket_t * p_socket )
+static int NetworkOpen( vlc_object_t * p_this, network_socket_t * p_socket )
 {
     if( p_socket->i_type == NETWORK_UDP )
     {
-        return OpenUDP( p_socket );
+        return OpenUDP( p_this, p_socket );
     }
     else
     {
-        return OpenTCP( p_socket );
+        return OpenTCP( p_this, p_socket );
     }
 }
diff --git a/plugins/satellite/satellite_tools.c b/plugins/satellite/satellite_tools.c
index 77d45e0e19..ab15386d2f 100644
--- a/plugins/satellite/satellite_tools.c
+++ b/plugins/satellite/satellite_tools.c
@@ -21,9 +21,13 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA    02111, USA.
  *****************************************************************************/
 
+#include <vlc/vlc.h>
+
 #include <sys/ioctl.h>
 #include <stdio.h>
-#include <inttypes.h>
+#ifdef HAVE_INTTYPES_H
+#   include <inttypes.h>                                       /* int16_t .. */
+#endif
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/po/de.po b/po/de.po
index c921d2b28a..94036b1778 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vlc 0.73.3\n"
-"POT-Creation-Date: 2002-05-31 11:45+0200\n"
+"POT-Creation-Date: 2002-06-01 18:43+0200\n"
 "PO-Revision-Date: 2002-04-18 23:38+0100\n"
 "Last-Translator: Thomas Graf <tgr@reeler.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,13 +14,13 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/libvlc.c:270
+#: src/libvlc.c:277
 #, c-format
 msgid "Usage: %s [options] [parameters] [file]...\n"
 msgstr "Usage: %s [Optionen] [Parameter] [Date]...\n"
 
 #. Print module name
-#: src/libvlc.c:828
+#: src/libvlc.c:868
 #, fuzzy, c-format
 msgid ""
 "%s module options:\n"
@@ -28,27 +28,27 @@ msgid ""
 msgstr "%s Modul Optionen:\n"
 
 #. We could also have "=<" here
-#: src/libvlc.c:848 src/misc/configuration.c:794
+#: src/libvlc.c:888 src/misc/configuration.c:798
 msgid "string"
 msgstr "text"
 
-#: src/libvlc.c:851 src/misc/configuration.c:779
+#: src/libvlc.c:891 src/misc/configuration.c:783
 msgid "integer"
 msgstr "zahl"
 
-#: src/libvlc.c:854 src/misc/configuration.c:786
+#: src/libvlc.c:894 src/misc/configuration.c:790
 msgid "float"
 msgstr "gleitpunktzahl"
 
-#: src/libvlc.c:860
-msgid " (default: enabled)"
+#: src/libvlc.c:900
+msgid " (default enabled)"
 msgstr ""
 
-#: src/libvlc.c:861
-msgid " (default: disabled)"
+#: src/libvlc.c:901
+msgid " (default disabled)"
 msgstr ""
 
-#: src/libvlc.c:915
+#: src/libvlc.c:955
 #, fuzzy
 msgid ""
 "\n"
@@ -79,7 +79,7 @@ msgstr ""
 "pausieren\n"
 "  vlc:quit                       \tVLC beenden"
 
-#: src/libvlc.c:936 src/libvlc.c:985 src/libvlc.c:1009 src/libvlc.c:1028
+#: src/libvlc.c:976 src/libvlc.c:1025 src/libvlc.c:1049 src/libvlc.c:1068
 #, fuzzy
 msgid ""
 "\n"
@@ -89,19 +89,19 @@ msgstr ""
 "Drück die Eingabetaste um weiterzufahren..."
 
 #. Usage
-#: src/libvlc.c:959
+#: src/libvlc.c:999
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options] [parameters] [file]...\n"
 "\n"
 msgstr "Usage: %s [Optionen] [Parameter] [Date]...\n"
 
-#: src/libvlc.c:962
+#: src/libvlc.c:1002
 #, fuzzy
 msgid "[module]              [description]\n"
 msgstr "[Modul]               [Beschreibung]"
 
-#: src/libvlc.c:1003
+#: src/libvlc.c:1043
 msgid ""
 "This program comes with NO WARRANTY, to the extent permitted by law.\n"
 "You may redistribute it under the terms of the GNU General Public License;\n"
@@ -113,7 +113,7 @@ msgstr ""
 #. * libvlc.h: main libvlc header
 #. *****************************************************************************
 #. * Copyright (C) 1998-2002 VideoLAN
-#. * $Id: de.po,v 1.10 2002/06/01 12:32:01 sam Exp $
+#. * $Id: de.po,v 1.11 2002/06/01 16:45:34 sam Exp $
 #. *
 #. * Authors: Vincent Seguin <seguin@via.ecp.fr>
 #. *          Samuel Hocevar <sam@zoy.org>
@@ -711,12 +711,12 @@ msgid "Playlist"
 msgstr "Abspielliste"
 
 #. Misc options
-#: plugins/a52/a52.c:81 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81
+#: plugins/a52/a52.c:83 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81
 #: plugins/dummy/dummy.c:51 plugins/fb/fb.c:70 plugins/filter/deinterlace.c:50
 #: plugins/filter/distort.c:50 plugins/filter/transform.c:51
 #: plugins/filter/wall.c:45 plugins/ggi/ggi.c:64 plugins/gtk/gnome.c:73
 #: plugins/gtk/gtk.c:71 plugins/mad/mad_adec.c:66 plugins/mga/xmga.c:106
-#: plugins/mpeg_vdec/video_parser.c:95 plugins/text/logger.c:86
+#: plugins/mpeg_vdec/video_parser.c:96 plugins/text/logger.c:86
 #: plugins/win32/win32.cpp:48 plugins/x11/x11.c:55 plugins/x11/xvideo.c:65
 #: src/libvlc.h:366
 msgid "Miscellaneous"
@@ -752,18 +752,18 @@ msgstr "Versionsinformationen ausgeben."
 msgid "print build information"
 msgstr "Versionsinformationen ausgeben."
 
-#: src/misc/configuration.c:779
+#: src/misc/configuration.c:783
 msgid "boolean"
 msgstr "boolesch"
 
 #. ****************************************************************************
 #. * Build configuration structure.
 #. ****************************************************************************
-#: plugins/a52/a52.c:72
+#: plugins/a52/a52.c:74
 msgid "A/52 dynamic range compression"
 msgstr ""
 
-#: plugins/a52/a52.c:74
+#: plugins/a52/a52.c:76
 msgid ""
 "Dynamic range compression makes the loud sounds softer, and the soft sounds "
 "louder, so you can more easily listen to the stream in a noisy environment "
@@ -771,7 +771,7 @@ msgid ""
 "playback will be more adapted to a movie theater or a listening room."
 msgstr ""
 
-#: plugins/a52/a52.c:86
+#: plugins/a52/a52.c:88
 msgid "a52 ATSC A/52 aka AC-3 audio decoder module"
 msgstr "a52 ATSC A/52 aka AC-3 Audio Dekoder Modul"
 
@@ -827,18 +827,18 @@ msgstr "I420,IYUV,YV12 to RGB,RV15,RV16,RV24,RV32 Umwandlungen"
 msgid "MMX I420,IYUV,YV12 to RV15,RV16,RV24,RV32 conversions"
 msgstr "MMX I420,IYUV,YV12 to RV15,RV16,RV24,RV32 Umwandlungen"
 
-#: plugins/chroma/i420_ymga.c:55 plugins/chroma/i420_yuy2.c:69
+#: plugins/chroma/i420_ymga.c:55 plugins/chroma/i420_yuy2.c:74
 #: plugins/chroma/i422_yuy2.c:68
 msgid "conversions from "
 msgstr "Wandlungen von "
 
 #: plugins/chroma/i420_ymga.c:55 plugins/chroma/i420_ymga.c:58
-#: plugins/chroma/i420_yuy2.c:69 plugins/chroma/i420_yuy2.c:72
+#: plugins/chroma/i420_yuy2.c:74 plugins/chroma/i420_yuy2.c:77
 #: plugins/chroma/i422_yuy2.c:68 plugins/chroma/i422_yuy2.c:71
 msgid " to "
 msgstr "zu "
 
-#: plugins/chroma/i420_ymga.c:58 plugins/chroma/i420_yuy2.c:72
+#: plugins/chroma/i420_ymga.c:58 plugins/chroma/i420_yuy2.c:77
 #: plugins/chroma/i422_yuy2.c:71
 msgid "MMX conversions from "
 msgstr "MXX Wandlungen von "
@@ -1781,11 +1781,11 @@ msgstr "Kapitel %d"
 #. ****************************************************************************
 #. * Build configuration tree.
 #. ****************************************************************************
-#: plugins/idct/idct.c:47 plugins/mpeg_vdec/video_parser.c:70
+#: plugins/idct/idct.c:47 plugins/mpeg_vdec/video_parser.c:71
 msgid "IDCT module"
 msgstr "IDCT Modul"
 
-#: plugins/idct/idctaltivec.c:49
+#: plugins/idct/idctaltivec.c:51
 #, fuzzy
 msgid "AltiVec IDCT module"
 msgstr "AltiVec IDCT Modul"
@@ -1901,7 +1901,7 @@ msgstr ""
 msgid "X11 MGA module"
 msgstr "X11 MGA Modul"
 
-#: plugins/motion/motion.c:45 plugins/mpeg_vdec/video_parser.c:76
+#: plugins/motion/motion.c:45 plugins/mpeg_vdec/video_parser.c:77
 msgid "motion compensation module"
 msgstr "Motion Compensation Modul"
 
@@ -1909,7 +1909,7 @@ msgstr "Motion Compensation Modul"
 msgid "3D Now! motion compensation module"
 msgstr "3D Now! Motion Compensation Modul"
 
-#: plugins/motion/motionaltivec.c:48
+#: plugins/motion/motionaltivec.c:50
 msgid "AltiVec motion compensation module"
 msgstr "AltiVec Motion Compensation Modul"
 
@@ -1942,7 +1942,7 @@ msgstr "ISO 13818-1 MPEG Transport Stream Eingabe"
 msgid "ISO 13818-1 MPEG Transport Stream input (libdvbpsi)"
 msgstr "ISO 13818-1 MPEG Transport Stream Eingabe"
 
-#: plugins/mpeg_vdec/video_parser.c:72
+#: plugins/mpeg_vdec/video_parser.c:73
 #, fuzzy
 msgid ""
 "This option allows you to select the IDCT module used by this video decoder. "
@@ -1951,7 +1951,7 @@ msgstr ""
 "Diese Option erlaubt Dir die Standard Oberfläche festzulegen.\n"
 "Merke Dir, standardmässig wird die beste Methode verwendet."
 
-#: plugins/mpeg_vdec/video_parser.c:78
+#: plugins/mpeg_vdec/video_parser.c:79
 #, fuzzy
 msgid ""
 "This option allows you to select the motion compensation module used by this "
@@ -1961,21 +1961,21 @@ msgstr ""
 "Diese Option erlaubt Dir den standard Video Ausgabemodus festzulegen.\n"
 "Merke Dir, standardmässig wird die beste Methode ausgewählt."
 
-#: plugins/mpeg_vdec/video_parser.c:82
+#: plugins/mpeg_vdec/video_parser.c:83
 msgid "use additional processors"
 msgstr "Benutz zusätzliche Prozessoren"
 
-#: plugins/mpeg_vdec/video_parser.c:84
+#: plugins/mpeg_vdec/video_parser.c:85
 msgid ""
 "This video decoder can benefit from a multiprocessor computer. If you have "
 "one, you can specify the number of processors here."
 msgstr ""
 
-#: plugins/mpeg_vdec/video_parser.c:87
+#: plugins/mpeg_vdec/video_parser.c:88
 msgid "force synchro algorithm {I|I+|IP|IP+|IPB}"
 msgstr "Synchro Algorithmus focieren {I|I+|IP|IP+|IPB}"
 
-#: plugins/mpeg_vdec/video_parser.c:89
+#: plugins/mpeg_vdec/video_parser.c:90
 msgid ""
 "This allows you to force the synchro algorithm, by directly selecting the "
 "types of picture you want to decode. Please bear in mind that if you select "
@@ -1983,7 +1983,7 @@ msgid ""
 "anything."
 msgstr ""
 
-#: plugins/mpeg_vdec/video_parser.c:106
+#: plugins/mpeg_vdec/video_parser.c:107
 msgid "MPEG I/II video decoder module"
 msgstr "MPEG I/II Video Dekoder Modul"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index ad1ab07cb1..00bdec7093 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-05-30 13:40+0200\n"
+"POT-Creation-Date: 2002-06-01 18:43+0200\n"
 "PO-Revision-Date: 2002-04-22 09:56+0200\n"
 "Last-Translator: Samuel Hocevar <sam@zoy.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -13,17 +13,13 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/libvlc.c:247
-msgid "help module"
-msgstr ""
-
-#: src/libvlc.c:270
+#: src/libvlc.c:277
 #, c-format
 msgid "Usage: %s [options] [parameters] [file]...\n"
 msgstr ""
 
 #. Print module name
-#: src/libvlc.c:826
+#: src/libvlc.c:868
 #, c-format
 msgid ""
 "%s module options:\n"
@@ -31,19 +27,27 @@ msgid ""
 msgstr ""
 
 #. We could also have "=<" here
-#: src/libvlc.c:858 src/misc/configuration.c:777
+#: src/libvlc.c:888 src/misc/configuration.c:798
 msgid "string"
 msgstr ""
 
-#: src/libvlc.c:861 src/misc/configuration.c:762
+#: src/libvlc.c:891 src/misc/configuration.c:783
 msgid "integer"
 msgstr ""
 
-#: src/libvlc.c:864 src/misc/configuration.c:769
+#: src/libvlc.c:894 src/misc/configuration.c:790
 msgid "float"
 msgstr ""
 
-#: src/libvlc.c:897
+#: src/libvlc.c:900
+msgid " (default enabled)"
+msgstr ""
+
+#: src/libvlc.c:901
+msgid " (default disabled)"
+msgstr ""
+
+#: src/libvlc.c:955
 msgid ""
 "\n"
 "Playlist items:\n"
@@ -59,25 +63,25 @@ msgid ""
 "  vlc:quit                       quit VLC\n"
 msgstr ""
 
-#: src/libvlc.c:918 src/libvlc.c:967 src/libvlc.c:991 src/libvlc.c:1010
+#: src/libvlc.c:976 src/libvlc.c:1025 src/libvlc.c:1049 src/libvlc.c:1068
 msgid ""
 "\n"
 "Press the RETURN key to continue...\n"
 msgstr ""
 
 #. Usage
-#: src/libvlc.c:941
+#: src/libvlc.c:999
 #, c-format
 msgid ""
 "Usage: %s [options] [parameters] [file]...\n"
 "\n"
 msgstr ""
 
-#: src/libvlc.c:944
+#: src/libvlc.c:1002
 msgid "[module]              [description]\n"
 msgstr ""
 
-#: src/libvlc.c:985
+#: src/libvlc.c:1043
 msgid ""
 "This program comes with NO WARRANTY, to the extent permitted by law.\n"
 "You may redistribute it under the terms of the GNU General Public License;\n"
@@ -93,7 +97,7 @@ msgstr ""
 #. * libvlc.h: main libvlc header
 #. *****************************************************************************
 #. * Copyright (C) 1998-2002 VideoLAN
-#. * $Id: en_GB.po,v 1.6 2002/06/01 13:52:24 sam Exp $
+#. * $Id: en_GB.po,v 1.7 2002/06/01 16:45:34 sam Exp $
 #. *
 #. * Authors: Vincent Seguin <seguin@via.ecp.fr>
 #. *          Samuel Hocevar <sam@zoy.org>
@@ -128,9 +132,8 @@ msgid ""
 "This option allows you to select the interface used by vlc. The default "
 "behavior is to automatically select the best module available."
 msgstr ""
-"This option allows you to select the interface used by vlc. "
-"The default behaviour is to automatically select the best module "
-"available."
+"This option allows you to select the interface used by vlc. The default "
+"behaviour is to automatically select the best module available."
 
 #: src/libvlc.h:38
 msgid "be verbose"
@@ -178,41 +181,40 @@ msgid ""
 "The default behavior is to automatically select the best method available."
 msgstr ""
 "This option allows you to select the audio audio output method used by vlc. "
-"The default behaviour is to automatically select the best method "
-"available."
+"The default behaviour is to automatically select the best method available."
 
 #: src/libvlc.h:62
-msgid "disable audio"
+msgid "enable audio"
 msgstr ""
 
 #: src/libvlc.h:64
 msgid ""
-"This will completely disable the audio output. The audio decoding stage "
-"shouldn't even be done, so it can allow you to save some processing power."
+"You can completely disable the audio output. In this case the audio decoding "
+"stage won't be done, and it will save some processing power."
+msgstr ""
+
+#: src/libvlc.h:67
+msgid "force mono audio"
 msgstr ""
 
 #: src/libvlc.h:68
-msgid "mono audio"
-msgstr ""
-
-#: src/libvlc.h:69
 msgid "This will force a mono audio output"
 msgstr ""
 
-#: src/libvlc.h:71
+#: src/libvlc.h:70
 msgid "audio output volume"
 msgstr ""
 
-#: src/libvlc.h:73
+#: src/libvlc.h:72
 msgid ""
 "You can set the default audio output volume here, in a range from 0 to 1024."
 msgstr ""
 
-#: src/libvlc.h:76
+#: src/libvlc.h:75
 msgid "audio output format"
 msgstr ""
 
-#: src/libvlc.h:78
+#: src/libvlc.h:77
 msgid ""
 "You can force the audio output format here.\n"
 "0 -> 16 bits signed native endian (default)\n"
@@ -226,365 +228,382 @@ msgid ""
 "8 -> ac3 pass-through"
 msgstr ""
 
-#: src/libvlc.h:89
+#: src/libvlc.h:88
 msgid "audio output frequency (Hz)"
 msgstr ""
 
-#: src/libvlc.h:91
+#: src/libvlc.h:90
 msgid ""
 "You can force the audio output frequency here. Common values are 48000, "
 "44100, 32000, 22050, 16000, 11025, 8000."
 msgstr ""
 
-#: src/libvlc.h:94
+#: src/libvlc.h:93
 msgid "compensate desynchronization of audio (in ms)"
 msgstr ""
 
-#: src/libvlc.h:96
+#: src/libvlc.h:95
 msgid ""
 "This option allows you to delay the audio output. This can be handy if you "
 "notice a lag between the video and the audio."
 msgstr ""
 
-#: src/libvlc.h:99
+#: src/libvlc.h:98
 msgid "video output module"
 msgstr ""
 
-#: src/libvlc.h:101
+#: src/libvlc.h:100
 msgid ""
 "This option allows you to select the video output method used by vlc. The "
 "default behavior is to automatically select the best method available."
 msgstr ""
-"This option allows you to select the video output method used by vlc. "
-"The default behaviour is to automatically select the best method "
-"available."
+"This option allows you to select the video output method used by vlc. The "
+"default behaviour is to automatically select the best method available."
 
-#: src/libvlc.h:105
-msgid "disable video"
+#: src/libvlc.h:104
+msgid "enable video"
 msgstr ""
 
-#: src/libvlc.h:107
+#: src/libvlc.h:106
 msgid ""
-"This will completely disable the video output. The video decoding stage "
-"shouldn't even be done, so it can allow you to save some processing power."
+"You can completely disable the video output. In this case the video decoding "
+"stage won't be done, which will save some processing power."
 msgstr ""
 
-#: src/libvlc.h:111
+#: src/libvlc.h:109
 msgid "display identifier"
 msgstr ""
 
-#: src/libvlc.h:113
+#: src/libvlc.h:111
 msgid ""
 "This is the local display port that will be used for X11 drawing. For "
 "instance :0.1."
 msgstr ""
 
-#: src/libvlc.h:116
+#: src/libvlc.h:114
 msgid "video width"
 msgstr ""
 
-#: src/libvlc.h:118
+#: src/libvlc.h:116
 msgid ""
 "You can enforce the video width here. By default vlc will adapt to the video "
 "characteristics."
 msgstr ""
 
-#: src/libvlc.h:121
+#: src/libvlc.h:119
 msgid "video height"
 msgstr ""
 
-#: src/libvlc.h:123
+#: src/libvlc.h:121
 msgid ""
 "You can enforce the video height here. By default vlc will adapt to the "
 "video characteristics."
 msgstr ""
 
-#: src/libvlc.h:126
+#: src/libvlc.h:124
 msgid "zoom video"
 msgstr ""
 
-#: src/libvlc.h:128
+#: src/libvlc.h:126
 msgid "You can zoom the video by the specified factor."
 msgstr ""
 
-#: src/libvlc.h:130
+#: src/libvlc.h:128
 msgid "grayscale video output"
 msgstr "greyscale video output"
 
-#: src/libvlc.h:132
+#: src/libvlc.h:130
+#, fuzzy
 msgid ""
-"Using this option, vlc will not decode the color information from the video "
-"(this can also allow you to save some processing power)."
+"When enabled, the color information from the video won't be decoded (this "
+"can also allow you to save some processing power)."
 msgstr ""
 "Using this option, vlc will not decode the colour information from the video "
 "(this can also allow you to save some processing power)."
 
-#: src/libvlc.h:135
+#: src/libvlc.h:133
 msgid "fullscreen video output"
 msgstr ""
 
-#: src/libvlc.h:137
+#: src/libvlc.h:135
 msgid ""
 "If this option is enabled, vlc will always start a video in fullscreen mode."
 msgstr ""
 
+#: src/libvlc.h:138
+#, fuzzy
+msgid "overlay video output"
+msgstr "greyscale video output"
+
 #: src/libvlc.h:140
-msgid "disable hardware acceleration for the video output"
-msgstr ""
-
-#: src/libvlc.h:142
 msgid ""
-"By default vlc will try to take advantage of the overlay capabilities of you "
-"graphics card."
+"If enabled, vlc will try to take advantage of the overlay capabilities of "
+"you graphics card."
 msgstr ""
 
-#: src/libvlc.h:145
+#: src/libvlc.h:143
 msgid "force SPU position"
 msgstr ""
 
-#: src/libvlc.h:147
+#: src/libvlc.h:145
 msgid ""
 "You can use this option to place the subtitles under the movie, instead of "
 "over the movie. Try several positions."
 msgstr ""
 
-#: src/libvlc.h:150
+#: src/libvlc.h:148
 msgid "video filter module"
 msgstr ""
 
-#: src/libvlc.h:152
+#: src/libvlc.h:150
 msgid ""
 "This will allow you to add a post-processing filter to enhance the picture "
 "quality, for instance deinterlacing, or to clone or distort the video window."
 msgstr ""
 
-#: src/libvlc.h:156
+#: src/libvlc.h:154
 msgid "server port"
 msgstr ""
 
-#: src/libvlc.h:158
+#: src/libvlc.h:156
 msgid "This is the port used for UDP streams. By default, we chose 1234."
 msgstr ""
 
-#: src/libvlc.h:160
+#: src/libvlc.h:158
 msgid "enable network channel mode"
 msgstr ""
 
-#: src/libvlc.h:162
+#: src/libvlc.h:160
 msgid "Activate this option if you want to use the VideoLAN Channel Server."
 msgstr ""
 
-#: src/libvlc.h:164
+#: src/libvlc.h:162
 msgid "channel server address"
 msgstr ""
 
-#: src/libvlc.h:166
+#: src/libvlc.h:164
 msgid "Indicate here the address of the VideoLAN Channel Server."
 msgstr ""
 
-#: src/libvlc.h:168
+#: src/libvlc.h:166
 msgid "channel server port"
 msgstr ""
 
-#: src/libvlc.h:170
+#: src/libvlc.h:168
 msgid "Indicate here the port on which the VideoLAN Channel Server runs."
 msgstr ""
 
-#: src/libvlc.h:172
+#: src/libvlc.h:170
 msgid "network interface"
 msgstr ""
 
-#: src/libvlc.h:174
+#: src/libvlc.h:172
 msgid ""
 "If you have several interfaces on your Linux machine and use the VLAN "
 "solution, you may indicate here which interface to use."
 msgstr ""
 
-#: src/libvlc.h:177
+#: src/libvlc.h:175
 msgid "choose program (SID)"
 msgstr "choose programme (SID)"
 
-#: src/libvlc.h:179
+#: src/libvlc.h:177
 msgid "Choose the program to select by giving its Service ID."
 msgstr "Choose the programme to select by giving its Service ID."
 
-#: src/libvlc.h:181
+#: src/libvlc.h:179
 msgid "choose audio"
 msgstr ""
 
-#: src/libvlc.h:183
+#: src/libvlc.h:181
 msgid "Give the default type of audio you want to use in a DVD."
 msgstr ""
 
-#: src/libvlc.h:185
+#: src/libvlc.h:183
 msgid "choose channel"
 msgstr ""
 
-#: src/libvlc.h:187
+#: src/libvlc.h:185
 msgid ""
 "Give the stream number of the audio channel you want to use in a DVD (from 1 "
 "to n)."
 msgstr ""
 
-#: src/libvlc.h:190
+#: src/libvlc.h:188
 msgid "choose subtitles"
 msgstr ""
 
-#: src/libvlc.h:192
+#: src/libvlc.h:190
 msgid ""
 "Give the stream number of the subtitle channel you want to use in a DVD "
 "(from 1 to n)."
 msgstr ""
 
-#: src/libvlc.h:195
+#: src/libvlc.h:193
 msgid "DVD device"
 msgstr ""
 
-#: src/libvlc.h:197
+#: src/libvlc.h:195
 msgid "This is the default DVD device to use."
 msgstr ""
 
-#: src/libvlc.h:199
+#: src/libvlc.h:197
 msgid "VCD device"
 msgstr ""
 
-#: src/libvlc.h:201
+#: src/libvlc.h:199
 msgid "This is the default VCD device to use."
 msgstr ""
 
-#: src/libvlc.h:203
+#: src/libvlc.h:201
 msgid "force IPv6"
 msgstr ""
 
-#: src/libvlc.h:205
+#: src/libvlc.h:203
 msgid ""
 "If you check this box, IPv6 will be used by default for all UDP and HTTP "
 "connections."
 msgstr ""
 
-#: src/libvlc.h:208
+#: src/libvlc.h:206
 msgid "force IPv4"
 msgstr ""
 
-#: src/libvlc.h:210
+#: src/libvlc.h:208
 msgid ""
 "If you check this box, IPv4 will be used by default for all UDP and HTTP "
 "connections."
 msgstr ""
 
-#: src/libvlc.h:213
+#: src/libvlc.h:211
 msgid "choose MPEG audio decoder"
 msgstr ""
 
-#: src/libvlc.h:215
+#: src/libvlc.h:213
 msgid ""
 "This allows you to select the MPEG audio decoder you want to use. Common "
 "choices are builtin and mad."
 msgstr ""
 
-#: src/libvlc.h:218
+#: src/libvlc.h:216
 msgid "choose AC3 audio decoder"
 msgstr ""
 
-#: src/libvlc.h:220
+#: src/libvlc.h:218
 msgid ""
 "This allows you to select the AC3/A52 audio decoder you want to use. Common "
 "choices are builtin and a52."
 msgstr ""
 
-#: src/libvlc.h:223
-msgid "disable CPU's MMX support"
+#: src/libvlc.h:221
+msgid "enable CPU MMX support"
 msgstr ""
 
-#: src/libvlc.h:225
+#: src/libvlc.h:223
 msgid ""
-"If your processor supports the MMX instructions set but you don't want vlc "
-"to use them, you can use this option."
+"If your processor supports the MMX instructions set, vlc can take advantage "
+"of them."
+msgstr ""
+
+#: src/libvlc.h:226
+msgid "enable CPU 3D Now! support"
 msgstr ""
 
 #: src/libvlc.h:228
-msgid "disable CPU's 3D Now! support"
+msgid ""
+"If your processor supports the 3D Now! instructions set, vlc can take "
+"advantage of them."
 msgstr ""
 
-#: src/libvlc.h:230
-msgid ""
-"If your processor supports the 3D Now! instructions set but you don't want "
-"vlc to use them, you can use this option."
+#: src/libvlc.h:231
+msgid "enable CPU MMX EXT support"
 msgstr ""
 
 #: src/libvlc.h:233
-msgid "disable CPU's MMX EXT support"
+msgid ""
+"If your processor supports the MMX EXT instructions set, vlc can take "
+"advantage of them."
 msgstr ""
 
-#: src/libvlc.h:235
-msgid ""
-"If your processor supports the MMX EXT instructions set but you don't want "
-"vlc to use them, you can use this option."
+#: src/libvlc.h:236
+msgid "enable CPU SSE support"
 msgstr ""
 
 #: src/libvlc.h:238
-msgid "disable CPU's SSE support"
+msgid ""
+"If your processor supports the SSE instructions set, vlc can take can take "
+"advantage of them."
 msgstr ""
 
-#: src/libvlc.h:240
-msgid ""
-"If your processor supports the SSE instructions set but you don't want vlc "
-"to use them, you can use this option."
+#: src/libvlc.h:241
+msgid "enable CPU AltiVec support"
 msgstr ""
 
 #: src/libvlc.h:243
-msgid "disable CPU's AltiVec support"
-msgstr ""
-
-#: src/libvlc.h:245
 msgid ""
-"If your processor supports the AltiVec instructions set but you don't want "
-"vlc to use them, you can use this option."
+"If your processor supports the AltiVec instructions set, vlc can take "
+"advantage of them."
 msgstr ""
 
-#: src/libvlc.h:248
+#: src/libvlc.h:246
 msgid "launch playlist on startup"
 msgstr ""
 
-#: src/libvlc.h:250
+#: src/libvlc.h:248
 msgid "If you want vlc to start playing on startup, then enable this option."
 msgstr ""
 
-#: src/libvlc.h:252
-msgid "enqueue playlist as default"
+#: src/libvlc.h:250
+msgid "enqueue items in playlist"
 msgstr ""
 
-#: src/libvlc.h:254
+#: src/libvlc.h:252
 msgid ""
 "If you want vlc to add items to the playlist as you open them, then enable "
 "this option."
 msgstr ""
 
-#: src/libvlc.h:257
+#: src/libvlc.h:255
 msgid "loop playlist on end"
 msgstr ""
 
-#: src/libvlc.h:259
+#: src/libvlc.h:257
 msgid ""
 "If you want vlc to keep playing the playlist indefinitely then enable this "
 "option."
 msgstr ""
 
-#: src/libvlc.h:262
+#: src/libvlc.h:260
 msgid "memory copy module"
 msgstr ""
 
-#: src/libvlc.h:264
+#: src/libvlc.h:262
 msgid ""
 "You can select wich memory copy module you want to use. By default vlc will "
 "select the fastest one supported by your hardware."
 msgstr ""
 
+#: src/libvlc.h:265
+msgid "access module"
+msgstr ""
+
 #: src/libvlc.h:267
-msgid "fast pthread on NT/2K/XP (developpers only)"
+msgid "This is a legacy entry to let you configure access modules"
 msgstr ""
 
 #: src/libvlc.h:269
+msgid "demux module"
+msgstr ""
+
+#: src/libvlc.h:271
+msgid "This is a legacy entry to let you configure demux modules"
+msgstr ""
+
+#: src/libvlc.h:273
+msgid "fast pthread on NT/2K/XP (developpers only)"
+msgstr ""
+
+#: src/libvlc.h:275
 msgid ""
 "On Windows NT/2K/XP we use a slow but correct pthread implementation, you "
 "can also use this faster implementation but you might experience problems "
@@ -592,93 +611,94 @@ msgid ""
 msgstr ""
 
 #. Interface options
-#: src/libvlc.h:291
+#: src/libvlc.h:297
 msgid "Interface"
 msgstr ""
 
 #. Audio options
-#: plugins/directx/directx.c:56 src/libvlc.h:299
+#: src/libvlc.h:305
 msgid "Audio"
 msgstr ""
 
 #. Video options
-#: plugins/directx/directx.c:53 src/libvlc.h:310
+#: plugins/directx/directx.c:53 src/libvlc.h:315
 msgid "Video"
 msgstr ""
 
 #. Input options
-#: plugins/satellite/satellite.c:66 src/libvlc.h:323
+#: plugins/satellite/satellite.c:66 src/libvlc.h:328
 msgid "Input"
 msgstr ""
 
 #. Decoder options
-#: src/libvlc.h:342
+#: src/libvlc.h:347
 msgid "Decoders"
 msgstr ""
 
 #. CPU options
-#: src/libvlc.h:347
+#: src/libvlc.h:352
 msgid "CPU"
 msgstr ""
 
 #. Playlist options
 #: plugins/gtk/gnome_interface.c:506 plugins/gtk/gnome_interface.c:1824
 #: plugins/gtk/gnome_interface.c:1848 plugins/gtk/gtk_interface.c:611
-#: plugins/gtk/gtk_interface.c:2105 src/libvlc.h:355
+#: plugins/gtk/gtk_interface.c:2105 src/libvlc.h:360
 msgid "Playlist"
 msgstr ""
 
 #. Misc options
-#: plugins/a52/a52.c:81 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81
+#: plugins/a52/a52.c:83 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81
 #: plugins/dummy/dummy.c:51 plugins/fb/fb.c:70 plugins/filter/deinterlace.c:50
 #: plugins/filter/distort.c:50 plugins/filter/transform.c:51
-#: plugins/filter/wall.c:45 plugins/ggi/ggi.c:64 plugins/gtk/gnome.c:72
+#: plugins/filter/wall.c:45 plugins/ggi/ggi.c:64 plugins/gtk/gnome.c:73
 #: plugins/gtk/gtk.c:71 plugins/mad/mad_adec.c:66 plugins/mga/xmga.c:106
-#: plugins/mpeg_vdec/video_parser.c:95 plugins/text/logger.c:86
-#: plugins/x11/x11.c:55 plugins/x11/xvideo.c:65 src/libvlc.h:361
+#: plugins/mpeg_vdec/video_parser.c:96 plugins/text/logger.c:86
+#: plugins/win32/win32.cpp:48 plugins/x11/x11.c:55 plugins/x11/xvideo.c:65
+#: src/libvlc.h:366
 msgid "Miscellaneous"
 msgstr ""
 
-#: src/libvlc.h:373
+#: src/libvlc.h:378
 msgid "main program"
 msgstr "main programme"
 
-#: src/libvlc.h:387
+#: src/libvlc.h:390
 msgid "print help"
 msgstr ""
 
-#: src/libvlc.h:389
+#: src/libvlc.h:392
 msgid "print detailed help"
 msgstr ""
 
-#: src/libvlc.h:391
+#: src/libvlc.h:394
 msgid "print a list of available modules"
 msgstr ""
 
-#: src/libvlc.h:393
-msgid "print help on module <string>"
+#: src/libvlc.h:396
+msgid "print help on module"
 msgstr ""
 
-#: src/libvlc.h:396
+#: src/libvlc.h:399
 msgid "print version information"
 msgstr ""
 
-#: src/libvlc.h:398
+#: src/libvlc.h:401
 msgid "print build information"
 msgstr ""
 
-#: src/misc/configuration.c:762
+#: src/misc/configuration.c:783
 msgid "boolean"
 msgstr ""
 
 #. ****************************************************************************
 #. * Build configuration structure.
 #. ****************************************************************************
-#: plugins/a52/a52.c:72
-msgid "disable A/52 dynamic range compression"
+#: plugins/a52/a52.c:74
+msgid "A/52 dynamic range compression"
 msgstr ""
 
-#: plugins/a52/a52.c:74
+#: plugins/a52/a52.c:76
 msgid ""
 "Dynamic range compression makes the loud sounds softer, and the soft sounds "
 "louder, so you can more easily listen to the stream in a noisy environment "
@@ -686,7 +706,7 @@ msgid ""
 "playback will be more adapted to a movie theater or a listening room."
 msgstr ""
 
-#: plugins/a52/a52.c:86
+#: plugins/a52/a52.c:88
 msgid "a52 ATSC A/52 aka AC-3 audio decoder module"
 msgstr ""
 
@@ -742,18 +762,18 @@ msgstr ""
 msgid "MMX I420,IYUV,YV12 to RV15,RV16,RV24,RV32 conversions"
 msgstr ""
 
-#: plugins/chroma/i420_ymga.c:55 plugins/chroma/i420_yuy2.c:69
+#: plugins/chroma/i420_ymga.c:55 plugins/chroma/i420_yuy2.c:74
 #: plugins/chroma/i422_yuy2.c:68
 msgid "conversions from "
 msgstr ""
 
 #: plugins/chroma/i420_ymga.c:55 plugins/chroma/i420_ymga.c:58
-#: plugins/chroma/i420_yuy2.c:69 plugins/chroma/i420_yuy2.c:72
+#: plugins/chroma/i420_yuy2.c:74 plugins/chroma/i420_yuy2.c:77
 #: plugins/chroma/i422_yuy2.c:68 plugins/chroma/i422_yuy2.c:71
 msgid " to "
 msgstr ""
 
-#: plugins/chroma/i420_ymga.c:58 plugins/chroma/i420_yuy2.c:72
+#: plugins/chroma/i420_ymga.c:58 plugins/chroma/i420_yuy2.c:77
 #: plugins/chroma/i422_yuy2.c:71
 msgid "MMX conversions from "
 msgstr ""
@@ -762,17 +782,17 @@ msgstr ""
 #. * Building configuration tree
 #. ****************************************************************************
 #: plugins/directx/directx.c:41
-msgid "Disable hardware YUV->RGB conversions"
+msgid "use hardware YUV->RGB conversions"
 msgstr ""
 
 #: plugins/directx/directx.c:43
 msgid ""
-"Don't try to use hardware acceleration for YUV->RGB conversions. This option "
+"Try to use hardware acceleration for YUV->RGB conversions. This option "
 "doesn't have any effect when using overlays."
 msgstr ""
 
 #: plugins/directx/directx.c:45
-msgid "Use video buffers in system memory"
+msgid "use video buffers in system memory"
 msgstr ""
 
 #: plugins/directx/directx.c:47
@@ -783,7 +803,7 @@ msgid ""
 "doesn't have any effect when using overlays."
 msgstr ""
 
-#: plugins/directx/directx.c:60
+#: plugins/directx/directx.c:59
 msgid "DirectX extension module"
 msgstr ""
 
@@ -951,36 +971,36 @@ msgstr ""
 #. * Building configuration tree
 #. ****************************************************************************
 #: plugins/gtk/gnome.c:61 plugins/gtk/gtk.c:62
-msgid "hide tooltips"
+msgid "show tooltips"
 msgstr ""
 
 #: plugins/gtk/gnome.c:62 plugins/gtk/gtk.c:63
-msgid "Do not show tooltips for configuration options."
+msgid "Show tooltips for configuration options."
 msgstr ""
 
-#: plugins/gtk/gnome.c:66 plugins/gtk/gtk.c:65
+#: plugins/gtk/gnome.c:67 plugins/gtk/gtk.c:65
 msgid "maximum height for the configuration windows"
 msgstr ""
 
-#: plugins/gtk/gnome.c:68 plugins/gtk/gtk.c:67
+#: plugins/gtk/gnome.c:69 plugins/gtk/gtk.c:67
 msgid ""
 "You can set the maximum height that the configuration windows in the "
 "preferences menu will occupy."
 msgstr ""
 
-#: plugins/gtk/gtk.c:80
+#: plugins/gtk/gtk.c:78
 msgid "Gtk+ interface module"
 msgstr ""
 
-#: plugins/gtk/gnome.c:63
-msgid "hide text on toolbar buttons"
-msgstr ""
-
 #: plugins/gtk/gnome.c:64
-msgid "Do not show the text below icons on the toolbar."
+msgid "show text on toolbar buttons"
 msgstr ""
 
-#: plugins/gtk/gnome.c:83
+#: plugins/gtk/gnome.c:65
+msgid "Show the text below icons on the toolbar."
+msgstr ""
+
+#: plugins/gtk/gnome.c:84
 msgid "Gnome interface module"
 msgstr ""
 
@@ -1330,7 +1350,7 @@ msgstr ""
 #: plugins/gtk/gtk_interface.c:1386 plugins/gtk/gtk_interface.c:1609
 #: plugins/gtk/gtk_interface.c:1915 plugins/gtk/gtk_interface.c:2046
 #: plugins/gtk/gtk_interface.c:2277 plugins/gtk/gtk_interface.c:2383
-#: plugins/gtk/gtk_interface.c:2589 plugins/gtk/gtk_preferences.c:523
+#: plugins/gtk/gtk_interface.c:2589 plugins/gtk/gtk_preferences.c:526
 msgid "OK"
 msgstr ""
 
@@ -1363,14 +1383,14 @@ msgid "Starting position"
 msgstr ""
 
 #: plugins/gtk/gnome_interface.c:1318 plugins/gtk/gnome_interface.c:2269
-#: plugins/gtk/gtk_interface.c:1555 plugins/gtk/gtk_menu.c:788
-#: plugins/gtk/gtk_menu.c:923
+#: plugins/gtk/gtk_interface.c:1555 plugins/gtk/gtk_menu.c:787
+#: plugins/gtk/gtk_menu.c:922
 msgid "Chapter"
 msgstr ""
 
 #: plugins/gtk/gnome_interface.c:1308 plugins/gtk/gnome_interface.c:2259
-#: plugins/gtk/gtk_interface.c:1565 plugins/gtk/gtk_menu.c:893
-#: plugins/gtk/gtk_menu.c:914
+#: plugins/gtk/gtk_interface.c:1565 plugins/gtk/gtk_menu.c:892
+#: plugins/gtk/gtk_menu.c:913
 msgid "Title"
 msgstr ""
 
@@ -1380,7 +1400,7 @@ msgstr ""
 
 #: plugins/gtk/gtk_interface.c:1616 plugins/gtk/gtk_interface.c:1922
 #: plugins/gtk/gtk_interface.c:2053 plugins/gtk/gtk_interface.c:2284
-#: plugins/gtk/gtk_interface.c:2596 plugins/gtk/gtk_preferences.c:535
+#: plugins/gtk/gtk_interface.c:2596 plugins/gtk/gtk_preferences.c:538
 msgid "Cancel"
 msgstr ""
 
@@ -1602,7 +1622,7 @@ msgstr ""
 msgid "Invert"
 msgstr ""
 
-#: plugins/gtk/gnome_interface.c:1773 plugins/gtk/gtk_preferences.c:361
+#: plugins/gtk/gnome_interface.c:1773 plugins/gtk/gtk_preferences.c:364
 msgid "Select"
 msgstr ""
 
@@ -1642,42 +1662,42 @@ msgstr ""
 msgid "Channel server"
 msgstr ""
 
-#: plugins/gtk/gtk_preferences.c:307
+#: plugins/gtk/gtk_preferences.c:310
 msgid "Name"
 msgstr ""
 
-#: plugins/gtk/gtk_preferences.c:307
+#: plugins/gtk/gtk_preferences.c:310
 msgid "Description"
 msgstr ""
 
-#: plugins/gtk/gtk_preferences.c:350
+#: plugins/gtk/gtk_preferences.c:353
 msgid "Configure"
 msgstr ""
 
 #. add new label
-#: plugins/gtk/gtk_preferences.c:373
+#: plugins/gtk/gtk_preferences.c:376
 msgid "Selected:"
 msgstr ""
 
-#: plugins/gtk/gtk_preferences.c:514 plugins/gtk/gtk_preferences.c:531
+#: plugins/gtk/gtk_preferences.c:517 plugins/gtk/gtk_preferences.c:534
 msgid "Save"
 msgstr ""
 
-#: plugins/gtk/gtk_preferences.c:527
+#: plugins/gtk/gtk_preferences.c:530
 msgid "Apply"
 msgstr ""
 
 #. special case for "off" item
-#: plugins/gtk/gtk_menu.c:514
+#: plugins/gtk/gtk_menu.c:513
 msgid "None"
 msgstr ""
 
-#: plugins/gtk/gtk_menu.c:673
+#: plugins/gtk/gtk_menu.c:672
 #, c-format
 msgid "Title %d (%d)"
 msgstr ""
 
-#: plugins/gtk/gtk_menu.c:736
+#: plugins/gtk/gtk_menu.c:735
 #, c-format
 msgid "Chapter %d"
 msgstr ""
@@ -1685,11 +1705,11 @@ msgstr ""
 #. ****************************************************************************
 #. * Build configuration tree.
 #. ****************************************************************************
-#: plugins/idct/idct.c:47 plugins/mpeg_vdec/video_parser.c:70
+#: plugins/idct/idct.c:47 plugins/mpeg_vdec/video_parser.c:71
 msgid "IDCT module"
 msgstr ""
 
-#: plugins/idct/idctaltivec.c:49
+#: plugins/idct/idctaltivec.c:51
 msgid "AltiVec IDCT module"
 msgstr ""
 
@@ -1797,7 +1817,7 @@ msgstr ""
 msgid "X11 MGA module"
 msgstr ""
 
-#: plugins/motion/motion.c:45 plugins/mpeg_vdec/video_parser.c:76
+#: plugins/motion/motion.c:45 plugins/mpeg_vdec/video_parser.c:77
 msgid "motion compensation module"
 msgstr ""
 
@@ -1805,7 +1825,7 @@ msgstr ""
 msgid "3D Now! motion compensation module"
 msgstr ""
 
-#: plugins/motion/motionaltivec.c:48
+#: plugins/motion/motionaltivec.c:50
 msgid "AltiVec motion compensation module"
 msgstr ""
 
@@ -1837,42 +1857,39 @@ msgstr ""
 msgid "ISO 13818-1 MPEG Transport Stream input (libdvbpsi)"
 msgstr ""
 
-#: plugins/mpeg_vdec/video_parser.c:72
+#: plugins/mpeg_vdec/video_parser.c:73
 msgid ""
 "This option allows you to select the IDCT module used by this video decoder. "
 "The default behavior is to automatically select the best module available."
 msgstr ""
-"This option allows you to select the IDCT module used by this video "
-"decoder. "
-"The default behaviour is to automatically select the best module "
-"available."
+"This option allows you to select the IDCT module used by this video decoder. "
+"The default behaviour is to automatically select the best module available."
 
-#: plugins/mpeg_vdec/video_parser.c:78
+#: plugins/mpeg_vdec/video_parser.c:79
 msgid ""
 "This option allows you to select the motion compensation module used by this "
 "video decoder. The default behavior is to automatically select the best "
 "module available."
 msgstr ""
 "This option allows you to select the motion compensation module used by this "
-"video decoder. "
-"The default behaviour is to automatically select the best module "
-"available."
+"video decoder. The default behaviour is to automatically select the best "
+"module available."
 
-#: plugins/mpeg_vdec/video_parser.c:82
+#: plugins/mpeg_vdec/video_parser.c:83
 msgid "use additional processors"
 msgstr ""
 
-#: plugins/mpeg_vdec/video_parser.c:84
+#: plugins/mpeg_vdec/video_parser.c:85
 msgid ""
 "This video decoder can benefit from a multiprocessor computer. If you have "
 "one, you can specify the number of processors here."
 msgstr ""
 
-#: plugins/mpeg_vdec/video_parser.c:87
+#: plugins/mpeg_vdec/video_parser.c:88
 msgid "force synchro algorithm {I|I+|IP|IP+|IPB}"
 msgstr ""
 
-#: plugins/mpeg_vdec/video_parser.c:89
+#: plugins/mpeg_vdec/video_parser.c:90
 msgid ""
 "This allows you to force the synchro algorithm, by directly selecting the "
 "types of picture you want to decode. Please bear in mind that if you select "
@@ -1880,7 +1897,7 @@ msgid ""
 "anything."
 msgstr ""
 
-#: plugins/mpeg_vdec/video_parser.c:106
+#: plugins/mpeg_vdec/video_parser.c:107
 msgid "MPEG I/II video decoder module"
 msgstr ""
 
@@ -1990,11 +2007,24 @@ msgstr ""
 msgid "Win32 waveOut extension module"
 msgstr ""
 
-#: plugins/win32/win32.cpp:45
+#. ****************************************************************************
+#. * Build configuration tree.
+#. ****************************************************************************
+#: plugins/win32/win32.cpp:42
+msgid "maximum number of lines in the log window"
+msgstr ""
+
+#: plugins/win32/win32.cpp:44
+msgid ""
+"You can set the maximum number of lines that the log window will display. "
+"Enter -1 if you want to keep all messages."
+msgstr ""
+
+#: plugins/win32/win32.cpp:53
 msgid "Win32 interface module"
 msgstr ""
 
-#: plugins/x11/x11.c:62
+#: plugins/x11/x11.c:61
 msgid "X11 module"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index a1b840f07b..890e5daf41 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-05-31 11:45+0200\n"
+"POT-Creation-Date: 2002-06-01 18:43+0200\n"
 "PO-Revision-Date: 2001-12-10 13:32+0100\n"
 "Last-Translator: Samuel Hocevar <sam@zoy.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -13,13 +13,13 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/libvlc.c:270
+#: src/libvlc.c:277
 #, c-format
 msgid "Usage: %s [options] [parameters] [file]...\n"
 msgstr "Utilisation: %s [options] [paramčtres] [fichier]...\n"
 
 #. Print module name
-#: src/libvlc.c:828
+#: src/libvlc.c:868
 #, c-format
 msgid ""
 "%s module options:\n"
@@ -29,27 +29,27 @@ msgstr ""
 "\n"
 
 #. We could also have "=<" here
-#: src/libvlc.c:848 src/misc/configuration.c:794
+#: src/libvlc.c:888 src/misc/configuration.c:798
 msgid "string"
 msgstr "chaîne"
 
-#: src/libvlc.c:851 src/misc/configuration.c:779
+#: src/libvlc.c:891 src/misc/configuration.c:783
 msgid "integer"
 msgstr "entier"
 
-#: src/libvlc.c:854 src/misc/configuration.c:786
+#: src/libvlc.c:894 src/misc/configuration.c:790
 msgid "float"
 msgstr "flottant"
 
-#: src/libvlc.c:860
-msgid " (default: enabled)"
+#: src/libvlc.c:900
+msgid " (default enabled)"
 msgstr ""
 
-#: src/libvlc.c:861
-msgid " (default: disabled)"
+#: src/libvlc.c:901
+msgid " (default disabled)"
 msgstr ""
 
-#: src/libvlc.c:915
+#: src/libvlc.c:955
 msgid ""
 "\n"
 "Playlist items:\n"
@@ -77,7 +77,7 @@ msgstr ""
 "  vlc:pause                      fait une pause dans la playlist\n"
 "  vlc:quit                       quitter VLC\n"
 
-#: src/libvlc.c:936 src/libvlc.c:985 src/libvlc.c:1009 src/libvlc.c:1028
+#: src/libvlc.c:976 src/libvlc.c:1025 src/libvlc.c:1049 src/libvlc.c:1068
 msgid ""
 "\n"
 "Press the RETURN key to continue...\n"
@@ -86,7 +86,7 @@ msgstr ""
 "Appuyez sur ENTRÉE pour continuer...\n"
 
 #. Usage
-#: src/libvlc.c:959
+#: src/libvlc.c:999
 #, c-format
 msgid ""
 "Usage: %s [options] [parameters] [file]...\n"
@@ -95,11 +95,11 @@ msgstr ""
 "Utilisation: %s [options] [paramčtres] [fichier]...\n"
 "\n"
 
-#: src/libvlc.c:962
+#: src/libvlc.c:1002
 msgid "[module]              [description]\n"
 msgstr "[module]              [description]\n"
 
-#: src/libvlc.c:1003
+#: src/libvlc.c:1043
 msgid ""
 "This program comes with NO WARRANTY, to the extent permitted by law.\n"
 "You may redistribute it under the terms of the GNU General Public License;\n"
@@ -116,7 +116,7 @@ msgstr ""
 #. * libvlc.h: main libvlc header
 #. *****************************************************************************
 #. * Copyright (C) 1998-2002 VideoLAN
-#. * $Id: fr.po,v 1.13 2002/06/01 12:32:01 sam Exp $
+#. * $Id: fr.po,v 1.14 2002/06/01 16:45:34 sam Exp $
 #. *
 #. * Authors: Vincent Seguin <seguin@via.ecp.fr>
 #. *          Samuel Hocevar <sam@zoy.org>
@@ -708,12 +708,12 @@ msgid "Playlist"
 msgstr "Playlist"
 
 #. Misc options
-#: plugins/a52/a52.c:81 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81
+#: plugins/a52/a52.c:83 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81
 #: plugins/dummy/dummy.c:51 plugins/fb/fb.c:70 plugins/filter/deinterlace.c:50
 #: plugins/filter/distort.c:50 plugins/filter/transform.c:51
 #: plugins/filter/wall.c:45 plugins/ggi/ggi.c:64 plugins/gtk/gnome.c:73
 #: plugins/gtk/gtk.c:71 plugins/mad/mad_adec.c:66 plugins/mga/xmga.c:106
-#: plugins/mpeg_vdec/video_parser.c:95 plugins/text/logger.c:86
+#: plugins/mpeg_vdec/video_parser.c:96 plugins/text/logger.c:86
 #: plugins/win32/win32.cpp:48 plugins/x11/x11.c:55 plugins/x11/xvideo.c:65
 #: src/libvlc.h:366
 msgid "Miscellaneous"
@@ -747,18 +747,18 @@ msgstr "afficher le nom et la version du logiciel"
 msgid "print build information"
 msgstr "afficher les informations de compilation du logiciel"
 
-#: src/misc/configuration.c:779
+#: src/misc/configuration.c:783
 msgid "boolean"
 msgstr "booléen"
 
 #. ****************************************************************************
 #. * Build configuration structure.
 #. ****************************************************************************
-#: plugins/a52/a52.c:72
+#: plugins/a52/a52.c:74
 msgid "A/52 dynamic range compression"
 msgstr ""
 
-#: plugins/a52/a52.c:74
+#: plugins/a52/a52.c:76
 msgid ""
 "Dynamic range compression makes the loud sounds softer, and the soft sounds "
 "louder, so you can more easily listen to the stream in a noisy environment "
@@ -766,7 +766,7 @@ msgid ""
 "playback will be more adapted to a movie theater or a listening room."
 msgstr ""
 
-#: plugins/a52/a52.c:86
+#: plugins/a52/a52.c:88
 msgid "a52 ATSC A/52 aka AC-3 audio decoder module"
 msgstr "module de décodage son ATSC A/52 (ou AC-3)"
 
@@ -822,18 +822,18 @@ msgstr "conversions de I420,IYUV,YV12 vers RGB,RV15,RV16,RV24,RV32"
 msgid "MMX I420,IYUV,YV12 to RV15,RV16,RV24,RV32 conversions"
 msgstr "conversions MMX de I420,IYUV,YV12 vers RV15,RV16,RV24,RV32"
 
-#: plugins/chroma/i420_ymga.c:55 plugins/chroma/i420_yuy2.c:69
+#: plugins/chroma/i420_ymga.c:55 plugins/chroma/i420_yuy2.c:74
 #: plugins/chroma/i422_yuy2.c:68
 msgid "conversions from "
 msgstr "conversions de "
 
 #: plugins/chroma/i420_ymga.c:55 plugins/chroma/i420_ymga.c:58
-#: plugins/chroma/i420_yuy2.c:69 plugins/chroma/i420_yuy2.c:72
+#: plugins/chroma/i420_yuy2.c:74 plugins/chroma/i420_yuy2.c:77
 #: plugins/chroma/i422_yuy2.c:68 plugins/chroma/i422_yuy2.c:71
 msgid " to "
 msgstr " vers "
 
-#: plugins/chroma/i420_ymga.c:58 plugins/chroma/i420_yuy2.c:72
+#: plugins/chroma/i420_ymga.c:58 plugins/chroma/i420_yuy2.c:77
 #: plugins/chroma/i422_yuy2.c:71
 msgid "MMX conversions from "
 msgstr "conversions MMX de "
@@ -1775,11 +1775,11 @@ msgstr "Chapitre %d"
 #. ****************************************************************************
 #. * Build configuration tree.
 #. ****************************************************************************
-#: plugins/idct/idct.c:47 plugins/mpeg_vdec/video_parser.c:70
+#: plugins/idct/idct.c:47 plugins/mpeg_vdec/video_parser.c:71
 msgid "IDCT module"
 msgstr "module d'IDCT"
 
-#: plugins/idct/idctaltivec.c:49
+#: plugins/idct/idctaltivec.c:51
 msgid "AltiVec IDCT module"
 msgstr "module d'IDCT optimisé AltiVec"
 
@@ -1898,7 +1898,7 @@ msgstr ""
 msgid "X11 MGA module"
 msgstr "module MGA X11"
 
-#: plugins/motion/motion.c:45 plugins/mpeg_vdec/video_parser.c:76
+#: plugins/motion/motion.c:45 plugins/mpeg_vdec/video_parser.c:77
 msgid "motion compensation module"
 msgstr "module de compensation de mouvement"
 
@@ -1906,7 +1906,7 @@ msgstr "module de compensation de mouvement"
 msgid "3D Now! motion compensation module"
 msgstr "module de compensation de mouvement optimisé 3D Now!"
 
-#: plugins/motion/motionaltivec.c:48
+#: plugins/motion/motionaltivec.c:50
 msgid "AltiVec motion compensation module"
 msgstr "module de compensation de mouvement optimisé AltiVec"
 
@@ -1938,7 +1938,7 @@ msgstr "entr
 msgid "ISO 13818-1 MPEG Transport Stream input (libdvbpsi)"
 msgstr "entrée ISO 13818-1 MPEG Transport Stream (libdvbpsi)"
 
-#: plugins/mpeg_vdec/video_parser.c:72
+#: plugins/mpeg_vdec/video_parser.c:73
 msgid ""
 "This option allows you to select the IDCT module used by this video decoder. "
 "The default behavior is to automatically select the best module available."
@@ -1947,7 +1947,7 @@ msgstr ""
 "Le comportement par défaut est de choisir automatiquement le meilleur module "
 "disponible."
 
-#: plugins/mpeg_vdec/video_parser.c:78
+#: plugins/mpeg_vdec/video_parser.c:79
 msgid ""
 "This option allows you to select the motion compensation module used by this "
 "video decoder. The default behavior is to automatically select the best "
@@ -1957,21 +1957,21 @@ msgstr ""
 "utilisépar ce décodeur vidéo. Le comportement par défaut est de choisir "
 "automatiquement le meilleur module disponible."
 
-#: plugins/mpeg_vdec/video_parser.c:82
+#: plugins/mpeg_vdec/video_parser.c:83
 msgid "use additional processors"
 msgstr "utiliser des processeurs supplémentaires"
 
-#: plugins/mpeg_vdec/video_parser.c:84
+#: plugins/mpeg_vdec/video_parser.c:85
 msgid ""
 "This video decoder can benefit from a multiprocessor computer. If you have "
 "one, you can specify the number of processors here."
 msgstr ""
 
-#: plugins/mpeg_vdec/video_parser.c:87
+#: plugins/mpeg_vdec/video_parser.c:88
 msgid "force synchro algorithm {I|I+|IP|IP+|IPB}"
 msgstr "forcer l'algorithme de synchro {I|I+|IP|IP+|IPB}"
 
-#: plugins/mpeg_vdec/video_parser.c:89
+#: plugins/mpeg_vdec/video_parser.c:90
 msgid ""
 "This allows you to force the synchro algorithm, by directly selecting the "
 "types of picture you want to decode. Please bear in mind that if you select "
@@ -1979,7 +1979,7 @@ msgid ""
 "anything."
 msgstr ""
 
-#: plugins/mpeg_vdec/video_parser.c:106
+#: plugins/mpeg_vdec/video_parser.c:107
 msgid "MPEG I/II video decoder module"
 msgstr "module décodeur vidéo MPEG I/II"
 
diff --git a/po/ja.po b/po/ja.po
index 415bc8b182..ccc553ec5d 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-05-31 11:45+0200\n"
+"POT-Creation-Date: 2002-06-01 18:43+0200\n"
 "PO-Revision-Date: 2002-04-02 03:22+0900\n"
 "Last-Translator: Fumio Nakayama <endymion@ca2.so-net.ne.jp>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -12,13 +12,13 @@ msgstr ""
 "Content-Type: text/plain; charset=euc-jp\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/libvlc.c:270
+#: src/libvlc.c:277
 #, c-format
 msgid "Usage: %s [options] [parameters] [file]...\n"
 msgstr ""
 
 #. Print module name
-#: src/libvlc.c:828
+#: src/libvlc.c:868
 #, c-format
 msgid ""
 "%s module options:\n"
@@ -26,27 +26,27 @@ msgid ""
 msgstr ""
 
 #. We could also have "=<" here
-#: src/libvlc.c:848 src/misc/configuration.c:794
+#: src/libvlc.c:888 src/misc/configuration.c:798
 msgid "string"
 msgstr ""
 
-#: src/libvlc.c:851 src/misc/configuration.c:779
+#: src/libvlc.c:891 src/misc/configuration.c:783
 msgid "integer"
 msgstr ""
 
-#: src/libvlc.c:854 src/misc/configuration.c:786
+#: src/libvlc.c:894 src/misc/configuration.c:790
 msgid "float"
 msgstr ""
 
-#: src/libvlc.c:860
-msgid " (default: enabled)"
+#: src/libvlc.c:900
+msgid " (default enabled)"
 msgstr ""
 
-#: src/libvlc.c:861
-msgid " (default: disabled)"
+#: src/libvlc.c:901
+msgid " (default disabled)"
 msgstr ""
 
-#: src/libvlc.c:915
+#: src/libvlc.c:955
 msgid ""
 "\n"
 "Playlist items:\n"
@@ -62,25 +62,25 @@ msgid ""
 "  vlc:quit                       quit VLC\n"
 msgstr ""
 
-#: src/libvlc.c:936 src/libvlc.c:985 src/libvlc.c:1009 src/libvlc.c:1028
+#: src/libvlc.c:976 src/libvlc.c:1025 src/libvlc.c:1049 src/libvlc.c:1068
 msgid ""
 "\n"
 "Press the RETURN key to continue...\n"
 msgstr ""
 
 #. Usage
-#: src/libvlc.c:959
+#: src/libvlc.c:999
 #, c-format
 msgid ""
 "Usage: %s [options] [parameters] [file]...\n"
 "\n"
 msgstr ""
 
-#: src/libvlc.c:962
+#: src/libvlc.c:1002
 msgid "[module]              [description]\n"
 msgstr ""
 
-#: src/libvlc.c:1003
+#: src/libvlc.c:1043
 msgid ""
 "This program comes with NO WARRANTY, to the extent permitted by law.\n"
 "You may redistribute it under the terms of the GNU General Public License;\n"
@@ -92,7 +92,7 @@ msgstr ""
 #. * libvlc.h: main libvlc header
 #. *****************************************************************************
 #. * Copyright (C) 1998-2002 VideoLAN
-#. * $Id: ja.po,v 1.9 2002/06/01 12:32:01 sam Exp $
+#. * $Id: ja.po,v 1.10 2002/06/01 16:45:34 sam Exp $
 #. *
 #. * Authors: Vincent Seguin <seguin@via.ecp.fr>
 #. *          Samuel Hocevar <sam@zoy.org>
@@ -647,12 +647,12 @@ msgid "Playlist"
 msgstr "ĽęĽšĽČ"
 
 #. Misc options
-#: plugins/a52/a52.c:81 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81
+#: plugins/a52/a52.c:83 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81
 #: plugins/dummy/dummy.c:51 plugins/fb/fb.c:70 plugins/filter/deinterlace.c:50
 #: plugins/filter/distort.c:50 plugins/filter/transform.c:51
 #: plugins/filter/wall.c:45 plugins/ggi/ggi.c:64 plugins/gtk/gnome.c:73
 #: plugins/gtk/gtk.c:71 plugins/mad/mad_adec.c:66 plugins/mga/xmga.c:106
-#: plugins/mpeg_vdec/video_parser.c:95 plugins/text/logger.c:86
+#: plugins/mpeg_vdec/video_parser.c:96 plugins/text/logger.c:86
 #: plugins/win32/win32.cpp:48 plugins/x11/x11.c:55 plugins/x11/xvideo.c:65
 #: src/libvlc.h:366
 msgid "Miscellaneous"
@@ -688,18 +688,18 @@ msgstr ""
 msgid "print build information"
 msgstr ""
 
-#: src/misc/configuration.c:779
+#: src/misc/configuration.c:783
 msgid "boolean"
 msgstr ""
 
 #. ****************************************************************************
 #. * Build configuration structure.
 #. ****************************************************************************
-#: plugins/a52/a52.c:72
+#: plugins/a52/a52.c:74
 msgid "A/52 dynamic range compression"
 msgstr ""
 
-#: plugins/a52/a52.c:74
+#: plugins/a52/a52.c:76
 msgid ""
 "Dynamic range compression makes the loud sounds softer, and the soft sounds "
 "louder, so you can more easily listen to the stream in a noisy environment "
@@ -707,7 +707,7 @@ msgid ""
 "playback will be more adapted to a movie theater or a listening room."
 msgstr ""
 
-#: plugins/a52/a52.c:86
+#: plugins/a52/a52.c:88
 msgid "a52 ATSC A/52 aka AC-3 audio decoder module"
 msgstr ""
 
@@ -763,19 +763,19 @@ msgstr ""
 msgid "MMX I420,IYUV,YV12 to RV15,RV16,RV24,RV32 conversions"
 msgstr ""
 
-#: plugins/chroma/i420_ymga.c:55 plugins/chroma/i420_yuy2.c:69
+#: plugins/chroma/i420_ymga.c:55 plugins/chroma/i420_yuy2.c:74
 #: plugins/chroma/i422_yuy2.c:68
 msgid "conversions from "
 msgstr ""
 
 #: plugins/chroma/i420_ymga.c:55 plugins/chroma/i420_ymga.c:58
-#: plugins/chroma/i420_yuy2.c:69 plugins/chroma/i420_yuy2.c:72
+#: plugins/chroma/i420_yuy2.c:74 plugins/chroma/i420_yuy2.c:77
 #: plugins/chroma/i422_yuy2.c:68 plugins/chroma/i422_yuy2.c:71
 #, fuzzy
 msgid " to "
 msgstr "Ľ¸ĽăĽóĽ×"
 
-#: plugins/chroma/i420_ymga.c:58 plugins/chroma/i420_yuy2.c:72
+#: plugins/chroma/i420_ymga.c:58 plugins/chroma/i420_yuy2.c:77
 #: plugins/chroma/i422_yuy2.c:71
 msgid "MMX conversions from "
 msgstr ""
@@ -1736,11 +1736,11 @@ msgstr "
 #. ****************************************************************************
 #. * Build configuration tree.
 #. ****************************************************************************
-#: plugins/idct/idct.c:47 plugins/mpeg_vdec/video_parser.c:70
+#: plugins/idct/idct.c:47 plugins/mpeg_vdec/video_parser.c:71
 msgid "IDCT module"
 msgstr ""
 
-#: plugins/idct/idctaltivec.c:49
+#: plugins/idct/idctaltivec.c:51
 msgid "AltiVec IDCT module"
 msgstr ""
 
@@ -1849,7 +1849,7 @@ msgstr ""
 msgid "X11 MGA module"
 msgstr ""
 
-#: plugins/motion/motion.c:45 plugins/mpeg_vdec/video_parser.c:76
+#: plugins/motion/motion.c:45 plugins/mpeg_vdec/video_parser.c:77
 msgid "motion compensation module"
 msgstr ""
 
@@ -1857,7 +1857,7 @@ msgstr ""
 msgid "3D Now! motion compensation module"
 msgstr ""
 
-#: plugins/motion/motionaltivec.c:48
+#: plugins/motion/motionaltivec.c:50
 msgid "AltiVec motion compensation module"
 msgstr ""
 
@@ -1889,34 +1889,34 @@ msgstr ""
 msgid "ISO 13818-1 MPEG Transport Stream input (libdvbpsi)"
 msgstr ""
 
-#: plugins/mpeg_vdec/video_parser.c:72
+#: plugins/mpeg_vdec/video_parser.c:73
 msgid ""
 "This option allows you to select the IDCT module used by this video decoder. "
 "The default behavior is to automatically select the best module available."
 msgstr ""
 
-#: plugins/mpeg_vdec/video_parser.c:78
+#: plugins/mpeg_vdec/video_parser.c:79
 msgid ""
 "This option allows you to select the motion compensation module used by this "
 "video decoder. The default behavior is to automatically select the best "
 "module available."
 msgstr ""
 
-#: plugins/mpeg_vdec/video_parser.c:82
+#: plugins/mpeg_vdec/video_parser.c:83
 msgid "use additional processors"
 msgstr ""
 
-#: plugins/mpeg_vdec/video_parser.c:84
+#: plugins/mpeg_vdec/video_parser.c:85
 msgid ""
 "This video decoder can benefit from a multiprocessor computer. If you have "
 "one, you can specify the number of processors here."
 msgstr ""
 
-#: plugins/mpeg_vdec/video_parser.c:87
+#: plugins/mpeg_vdec/video_parser.c:88
 msgid "force synchro algorithm {I|I+|IP|IP+|IPB}"
 msgstr ""
 
-#: plugins/mpeg_vdec/video_parser.c:89
+#: plugins/mpeg_vdec/video_parser.c:90
 msgid ""
 "This allows you to force the synchro algorithm, by directly selecting the "
 "types of picture you want to decode. Please bear in mind that if you select "
@@ -1924,7 +1924,7 @@ msgid ""
 "anything."
 msgstr ""
 
-#: plugins/mpeg_vdec/video_parser.c:106
+#: plugins/mpeg_vdec/video_parser.c:107
 msgid "MPEG I/II video decoder module"
 msgstr ""
 
diff --git a/po/nl.po b/po/nl.po
index 6bf70de988..488786482e 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-05-31 11:45+0200\n"
+"POT-Creation-Date: 2002-06-01 18:43+0200\n"
 "PO-Revision-Date: 2002-04-20 16:58GMT\n"
 "Last-Translator: Jean-Paul Saman <jpsaman@wxs.nl>\n"
 "Language-Team: Nederlands <nl@li.org>\n"
@@ -14,13 +14,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.8\n"
 
-#: src/libvlc.c:270
+#: src/libvlc.c:277
 #, c-format
 msgid "Usage: %s [options] [parameters] [file]...\n"
 msgstr "Gebruik: %s [opties] [parameters] [file] ...\n"
 
 #. Print module name
-#: src/libvlc.c:828
+#: src/libvlc.c:868
 #, fuzzy, c-format
 msgid ""
 "%s module options:\n"
@@ -28,27 +28,27 @@ msgid ""
 msgstr "%s module opties:\n"
 
 #. We could also have "=<" here
-#: src/libvlc.c:848 src/misc/configuration.c:794
+#: src/libvlc.c:888 src/misc/configuration.c:798
 msgid "string"
 msgstr ""
 
-#: src/libvlc.c:851 src/misc/configuration.c:779
+#: src/libvlc.c:891 src/misc/configuration.c:783
 msgid "integer"
 msgstr ""
 
-#: src/libvlc.c:854 src/misc/configuration.c:786
+#: src/libvlc.c:894 src/misc/configuration.c:790
 msgid "float"
 msgstr ""
 
-#: src/libvlc.c:860
-msgid " (default: enabled)"
+#: src/libvlc.c:900
+msgid " (default enabled)"
 msgstr ""
 
-#: src/libvlc.c:861
-msgid " (default: disabled)"
+#: src/libvlc.c:901
+msgid " (default disabled)"
 msgstr ""
 
-#: src/libvlc.c:915
+#: src/libvlc.c:955
 #, fuzzy
 msgid ""
 "\n"
@@ -77,7 +77,7 @@ msgstr ""
 "  vlc:pause                      \tpauzeer speellijst items\n"
 "  vlc:quit                       \tstop VLC"
 
-#: src/libvlc.c:936 src/libvlc.c:985 src/libvlc.c:1009 src/libvlc.c:1028
+#: src/libvlc.c:976 src/libvlc.c:1025 src/libvlc.c:1049 src/libvlc.c:1068
 #, fuzzy
 msgid ""
 "\n"
@@ -87,19 +87,19 @@ msgstr ""
 "Druk op RETURN om verder te gaan..."
 
 #. Usage
-#: src/libvlc.c:959
+#: src/libvlc.c:999
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options] [parameters] [file]...\n"
 "\n"
 msgstr "Gebruik: %s [opties] [parameters] [file] ...\n"
 
-#: src/libvlc.c:962
+#: src/libvlc.c:1002
 #, fuzzy
 msgid "[module]              [description]\n"
 msgstr "[module]              [beschrijving]"
 
-#: src/libvlc.c:1003
+#: src/libvlc.c:1043
 #, fuzzy
 msgid ""
 "This program comes with NO WARRANTY, to the extent permitted by law.\n"
@@ -118,7 +118,7 @@ msgstr ""
 #. * libvlc.h: main libvlc header
 #. *****************************************************************************
 #. * Copyright (C) 1998-2002 VideoLAN
-#. * $Id: nl.po,v 1.10 2002/06/01 12:32:01 sam Exp $
+#. * $Id: nl.po,v 1.11 2002/06/01 16:45:34 sam Exp $
 #. *
 #. * Authors: Vincent Seguin <seguin@via.ecp.fr>
 #. *          Samuel Hocevar <sam@zoy.org>
@@ -729,12 +729,12 @@ msgid "Playlist"
 msgstr "Speellijst"
 
 #. Misc options
-#: plugins/a52/a52.c:81 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81
+#: plugins/a52/a52.c:83 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81
 #: plugins/dummy/dummy.c:51 plugins/fb/fb.c:70 plugins/filter/deinterlace.c:50
 #: plugins/filter/distort.c:50 plugins/filter/transform.c:51
 #: plugins/filter/wall.c:45 plugins/ggi/ggi.c:64 plugins/gtk/gnome.c:73
 #: plugins/gtk/gtk.c:71 plugins/mad/mad_adec.c:66 plugins/mga/xmga.c:106
-#: plugins/mpeg_vdec/video_parser.c:95 plugins/text/logger.c:86
+#: plugins/mpeg_vdec/video_parser.c:96 plugins/text/logger.c:86
 #: plugins/win32/win32.cpp:48 plugins/x11/x11.c:55 plugins/x11/xvideo.c:65
 #: src/libvlc.h:366
 msgid "Miscellaneous"
@@ -770,18 +770,18 @@ msgstr "print versie informatie"
 msgid "print build information"
 msgstr "print versie informatie"
 
-#: src/misc/configuration.c:779
+#: src/misc/configuration.c:783
 msgid "boolean"
 msgstr ""
 
 #. ****************************************************************************
 #. * Build configuration structure.
 #. ****************************************************************************
-#: plugins/a52/a52.c:72
+#: plugins/a52/a52.c:74
 msgid "A/52 dynamic range compression"
 msgstr ""
 
-#: plugins/a52/a52.c:74
+#: plugins/a52/a52.c:76
 msgid ""
 "Dynamic range compression makes the loud sounds softer, and the soft sounds "
 "louder, so you can more easily listen to the stream in a noisy environment "
@@ -789,7 +789,7 @@ msgid ""
 "playback will be more adapted to a movie theater or a listening room."
 msgstr ""
 
-#: plugins/a52/a52.c:86
+#: plugins/a52/a52.c:88
 msgid "a52 ATSC A/52 aka AC-3 audio decoder module"
 msgstr ""
 
@@ -845,18 +845,18 @@ msgstr "I420,IYUV,YV12 to RGB,RV15,RV16,RV24,RV32 conversies"
 msgid "MMX I420,IYUV,YV12 to RV15,RV16,RV24,RV32 conversions"
 msgstr "MMX I420,IYUV,YV12 to RV15,RV16,RV24,RV32 conversies"
 
-#: plugins/chroma/i420_ymga.c:55 plugins/chroma/i420_yuy2.c:69
+#: plugins/chroma/i420_ymga.c:55 plugins/chroma/i420_yuy2.c:74
 #: plugins/chroma/i422_yuy2.c:68
 msgid "conversions from "
 msgstr "conversies van"
 
 #: plugins/chroma/i420_ymga.c:55 plugins/chroma/i420_ymga.c:58
-#: plugins/chroma/i420_yuy2.c:69 plugins/chroma/i420_yuy2.c:72
+#: plugins/chroma/i420_yuy2.c:74 plugins/chroma/i420_yuy2.c:77
 #: plugins/chroma/i422_yuy2.c:68 plugins/chroma/i422_yuy2.c:71
 msgid " to "
 msgstr " naar"
 
-#: plugins/chroma/i420_ymga.c:58 plugins/chroma/i420_yuy2.c:72
+#: plugins/chroma/i420_ymga.c:58 plugins/chroma/i420_yuy2.c:77
 #: plugins/chroma/i422_yuy2.c:71
 msgid "MMX conversions from "
 msgstr "MMX conversies van "
@@ -1807,11 +1807,11 @@ msgstr "Hoofdstuk %d"
 #. ****************************************************************************
 #. * Build configuration tree.
 #. ****************************************************************************
-#: plugins/idct/idct.c:47 plugins/mpeg_vdec/video_parser.c:70
+#: plugins/idct/idct.c:47 plugins/mpeg_vdec/video_parser.c:71
 msgid "IDCT module"
 msgstr ""
 
-#: plugins/idct/idctaltivec.c:49
+#: plugins/idct/idctaltivec.c:51
 msgid "AltiVec IDCT module"
 msgstr ""
 
@@ -1931,7 +1931,7 @@ msgstr ""
 msgid "X11 MGA module"
 msgstr ""
 
-#: plugins/motion/motion.c:45 plugins/mpeg_vdec/video_parser.c:76
+#: plugins/motion/motion.c:45 plugins/mpeg_vdec/video_parser.c:77
 msgid "motion compensation module"
 msgstr "motion compensatie module"
 
@@ -1939,7 +1939,7 @@ msgstr "motion compensatie module"
 msgid "3D Now! motion compensation module"
 msgstr "3D Now! motion compensatie module"
 
-#: plugins/motion/motionaltivec.c:48
+#: plugins/motion/motionaltivec.c:50
 msgid "AltiVec motion compensation module"
 msgstr "AltiVec motion compensatie module"
 
@@ -1971,7 +1971,7 @@ msgstr ""
 msgid "ISO 13818-1 MPEG Transport Stream input (libdvbpsi)"
 msgstr ""
 
-#: plugins/mpeg_vdec/video_parser.c:72
+#: plugins/mpeg_vdec/video_parser.c:73
 #, fuzzy
 msgid ""
 "This option allows you to select the IDCT module used by this video decoder. "
@@ -1980,7 +1980,7 @@ msgstr ""
 "Via deze optie kan de interface die vlc gebruikt geselecteerd worden.\n"
 "Noot: Standaard wordt automatisch de beste beschikbare methode gekozen."
 
-#: plugins/mpeg_vdec/video_parser.c:78
+#: plugins/mpeg_vdec/video_parser.c:79
 #, fuzzy
 msgid ""
 "This option allows you to select the motion compensation module used by this "
@@ -1990,21 +1990,21 @@ msgstr ""
 "Selecteer de video output methode die vlc gebruikt.\n"
 "Noot: Standaard wordt automatisch de best beschikbare methode gekozen."
 
-#: plugins/mpeg_vdec/video_parser.c:82
+#: plugins/mpeg_vdec/video_parser.c:83
 msgid "use additional processors"
 msgstr "gebruik extra processors"
 
-#: plugins/mpeg_vdec/video_parser.c:84
+#: plugins/mpeg_vdec/video_parser.c:85
 msgid ""
 "This video decoder can benefit from a multiprocessor computer. If you have "
 "one, you can specify the number of processors here."
 msgstr ""
 
-#: plugins/mpeg_vdec/video_parser.c:87
+#: plugins/mpeg_vdec/video_parser.c:88
 msgid "force synchro algorithm {I|I+|IP|IP+|IPB}"
 msgstr "forceer synchronisatie algorithme {I|I+|IP|IP+|IPB}"
 
-#: plugins/mpeg_vdec/video_parser.c:89
+#: plugins/mpeg_vdec/video_parser.c:90
 msgid ""
 "This allows you to force the synchro algorithm, by directly selecting the "
 "types of picture you want to decode. Please bear in mind that if you select "
@@ -2012,7 +2012,7 @@ msgid ""
 "anything."
 msgstr ""
 
-#: plugins/mpeg_vdec/video_parser.c:106
+#: plugins/mpeg_vdec/video_parser.c:107
 msgid "MPEG I/II video decoder module"
 msgstr ""
 
diff --git a/po/no.po b/po/no.po
index f69c711337..8ada9a4f88 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vlc-cvs\n"
-"POT-Creation-Date: 2002-05-31 11:45+0200\n"
+"POT-Creation-Date: 2002-06-01 18:43+0200\n"
 "PO-Revision-Date: 2002-28-02 23.35+0100\n"
 "Last-Translator: Sigmund Augdal <sigmunau@idi.ntnu.no>.\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -13,13 +13,13 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/libvlc.c:270
+#: src/libvlc.c:277
 #, c-format
 msgid "Usage: %s [options] [parameters] [file]...\n"
 msgstr ""
 
 #. Print module name
-#: src/libvlc.c:828
+#: src/libvlc.c:868
 #, c-format
 msgid ""
 "%s module options:\n"
@@ -27,27 +27,27 @@ msgid ""
 msgstr ""
 
 #. We could also have "=<" here
-#: src/libvlc.c:848 src/misc/configuration.c:794
+#: src/libvlc.c:888 src/misc/configuration.c:798
 msgid "string"
 msgstr ""
 
-#: src/libvlc.c:851 src/misc/configuration.c:779
+#: src/libvlc.c:891 src/misc/configuration.c:783
 msgid "integer"
 msgstr ""
 
-#: src/libvlc.c:854 src/misc/configuration.c:786
+#: src/libvlc.c:894 src/misc/configuration.c:790
 msgid "float"
 msgstr ""
 
-#: src/libvlc.c:860
-msgid " (default: enabled)"
+#: src/libvlc.c:900
+msgid " (default enabled)"
 msgstr ""
 
-#: src/libvlc.c:861
-msgid " (default: disabled)"
+#: src/libvlc.c:901
+msgid " (default disabled)"
 msgstr ""
 
-#: src/libvlc.c:915
+#: src/libvlc.c:955
 msgid ""
 "\n"
 "Playlist items:\n"
@@ -63,25 +63,25 @@ msgid ""
 "  vlc:quit                       quit VLC\n"
 msgstr ""
 
-#: src/libvlc.c:936 src/libvlc.c:985 src/libvlc.c:1009 src/libvlc.c:1028
+#: src/libvlc.c:976 src/libvlc.c:1025 src/libvlc.c:1049 src/libvlc.c:1068
 msgid ""
 "\n"
 "Press the RETURN key to continue...\n"
 msgstr ""
 
 #. Usage
-#: src/libvlc.c:959
+#: src/libvlc.c:999
 #, c-format
 msgid ""
 "Usage: %s [options] [parameters] [file]...\n"
 "\n"
 msgstr ""
 
-#: src/libvlc.c:962
+#: src/libvlc.c:1002
 msgid "[module]              [description]\n"
 msgstr ""
 
-#: src/libvlc.c:1003
+#: src/libvlc.c:1043
 msgid ""
 "This program comes with NO WARRANTY, to the extent permitted by law.\n"
 "You may redistribute it under the terms of the GNU General Public License;\n"
@@ -93,7 +93,7 @@ msgstr ""
 #. * libvlc.h: main libvlc header
 #. *****************************************************************************
 #. * Copyright (C) 1998-2002 VideoLAN
-#. * $Id: no.po,v 1.9 2002/06/01 12:32:01 sam Exp $
+#. * $Id: no.po,v 1.10 2002/06/01 16:45:34 sam Exp $
 #. *
 #. * Authors: Vincent Seguin <seguin@via.ecp.fr>
 #. *          Samuel Hocevar <sam@zoy.org>
@@ -654,12 +654,12 @@ msgid "Playlist"
 msgstr "Spilleliste"
 
 #. Misc options
-#: plugins/a52/a52.c:81 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81
+#: plugins/a52/a52.c:83 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81
 #: plugins/dummy/dummy.c:51 plugins/fb/fb.c:70 plugins/filter/deinterlace.c:50
 #: plugins/filter/distort.c:50 plugins/filter/transform.c:51
 #: plugins/filter/wall.c:45 plugins/ggi/ggi.c:64 plugins/gtk/gnome.c:73
 #: plugins/gtk/gtk.c:71 plugins/mad/mad_adec.c:66 plugins/mga/xmga.c:106
-#: plugins/mpeg_vdec/video_parser.c:95 plugins/text/logger.c:86
+#: plugins/mpeg_vdec/video_parser.c:96 plugins/text/logger.c:86
 #: plugins/win32/win32.cpp:48 plugins/x11/x11.c:55 plugins/x11/xvideo.c:65
 #: src/libvlc.h:366
 msgid "Miscellaneous"
@@ -695,18 +695,18 @@ msgstr ""
 msgid "print build information"
 msgstr ""
 
-#: src/misc/configuration.c:779
+#: src/misc/configuration.c:783
 msgid "boolean"
 msgstr ""
 
 #. ****************************************************************************
 #. * Build configuration structure.
 #. ****************************************************************************
-#: plugins/a52/a52.c:72
+#: plugins/a52/a52.c:74
 msgid "A/52 dynamic range compression"
 msgstr ""
 
-#: plugins/a52/a52.c:74
+#: plugins/a52/a52.c:76
 msgid ""
 "Dynamic range compression makes the loud sounds softer, and the soft sounds "
 "louder, so you can more easily listen to the stream in a noisy environment "
@@ -714,7 +714,7 @@ msgid ""
 "playback will be more adapted to a movie theater or a listening room."
 msgstr ""
 
-#: plugins/a52/a52.c:86
+#: plugins/a52/a52.c:88
 msgid "a52 ATSC A/52 aka AC-3 audio decoder module"
 msgstr ""
 
@@ -770,19 +770,19 @@ msgstr ""
 msgid "MMX I420,IYUV,YV12 to RV15,RV16,RV24,RV32 conversions"
 msgstr ""
 
-#: plugins/chroma/i420_ymga.c:55 plugins/chroma/i420_yuy2.c:69
+#: plugins/chroma/i420_ymga.c:55 plugins/chroma/i420_yuy2.c:74
 #: plugins/chroma/i422_yuy2.c:68
 msgid "conversions from "
 msgstr ""
 
 #: plugins/chroma/i420_ymga.c:55 plugins/chroma/i420_ymga.c:58
-#: plugins/chroma/i420_yuy2.c:69 plugins/chroma/i420_yuy2.c:72
+#: plugins/chroma/i420_yuy2.c:74 plugins/chroma/i420_yuy2.c:77
 #: plugins/chroma/i422_yuy2.c:68 plugins/chroma/i422_yuy2.c:71
 #, fuzzy
 msgid " to "
 msgstr "Hopp til: "
 
-#: plugins/chroma/i420_ymga.c:58 plugins/chroma/i420_yuy2.c:72
+#: plugins/chroma/i420_ymga.c:58 plugins/chroma/i420_yuy2.c:77
 #: plugins/chroma/i422_yuy2.c:71
 msgid "MMX conversions from "
 msgstr ""
@@ -1756,11 +1756,11 @@ msgstr "Kapittel"
 #. ****************************************************************************
 #. * Build configuration tree.
 #. ****************************************************************************
-#: plugins/idct/idct.c:47 plugins/mpeg_vdec/video_parser.c:70
+#: plugins/idct/idct.c:47 plugins/mpeg_vdec/video_parser.c:71
 msgid "IDCT module"
 msgstr ""
 
-#: plugins/idct/idctaltivec.c:49
+#: plugins/idct/idctaltivec.c:51
 msgid "AltiVec IDCT module"
 msgstr ""
 
@@ -1870,7 +1870,7 @@ msgstr ""
 msgid "X11 MGA module"
 msgstr ""
 
-#: plugins/motion/motion.c:45 plugins/mpeg_vdec/video_parser.c:76
+#: plugins/motion/motion.c:45 plugins/mpeg_vdec/video_parser.c:77
 msgid "motion compensation module"
 msgstr ""
 
@@ -1878,7 +1878,7 @@ msgstr ""
 msgid "3D Now! motion compensation module"
 msgstr ""
 
-#: plugins/motion/motionaltivec.c:48
+#: plugins/motion/motionaltivec.c:50
 msgid "AltiVec motion compensation module"
 msgstr ""
 
@@ -1910,34 +1910,34 @@ msgstr ""
 msgid "ISO 13818-1 MPEG Transport Stream input (libdvbpsi)"
 msgstr ""
 
-#: plugins/mpeg_vdec/video_parser.c:72
+#: plugins/mpeg_vdec/video_parser.c:73
 msgid ""
 "This option allows you to select the IDCT module used by this video decoder. "
 "The default behavior is to automatically select the best module available."
 msgstr ""
 
-#: plugins/mpeg_vdec/video_parser.c:78
+#: plugins/mpeg_vdec/video_parser.c:79
 msgid ""
 "This option allows you to select the motion compensation module used by this "
 "video decoder. The default behavior is to automatically select the best "
 "module available."
 msgstr ""
 
-#: plugins/mpeg_vdec/video_parser.c:82
+#: plugins/mpeg_vdec/video_parser.c:83
 msgid "use additional processors"
 msgstr ""
 
-#: plugins/mpeg_vdec/video_parser.c:84
+#: plugins/mpeg_vdec/video_parser.c:85
 msgid ""
 "This video decoder can benefit from a multiprocessor computer. If you have "
 "one, you can specify the number of processors here."
 msgstr ""
 
-#: plugins/mpeg_vdec/video_parser.c:87
+#: plugins/mpeg_vdec/video_parser.c:88
 msgid "force synchro algorithm {I|I+|IP|IP+|IPB}"
 msgstr ""
 
-#: plugins/mpeg_vdec/video_parser.c:89
+#: plugins/mpeg_vdec/video_parser.c:90
 msgid ""
 "This allows you to force the synchro algorithm, by directly selecting the "
 "types of picture you want to decode. Please bear in mind that if you select "
@@ -1945,7 +1945,7 @@ msgid ""
 "anything."
 msgstr ""
 
-#: plugins/mpeg_vdec/video_parser.c:106
+#: plugins/mpeg_vdec/video_parser.c:107
 msgid "MPEG I/II video decoder module"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index 263bb66917..a1f367a6bb 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vlc\n"
-"POT-Creation-Date: 2002-05-31 11:45+0200\n"
+"POT-Creation-Date: 2002-06-01 18:43+0200\n"
 "PO-Revision-Date: 2002-05-26 18:31+0200\n"
 "Last-Translator: Arkadiusz Lipiec <alipiec@elka.pw.edu.pl>\n"
 "Language-Team: polish <pl@li.org>\n"
@@ -13,13 +13,13 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/libvlc.c:270
+#: src/libvlc.c:277
 #, c-format
 msgid "Usage: %s [options] [parameters] [file]...\n"
 msgstr "Użycie: %s [opcje] [parametry] [plik]...\n"
 
 #. Print module name
-#: src/libvlc.c:828
+#: src/libvlc.c:868
 #, fuzzy, c-format
 msgid ""
 "%s module options:\n"
@@ -27,27 +27,27 @@ msgid ""
 msgstr "opcje modułu %s:\n"
 
 #. We could also have "=<" here
-#: src/libvlc.c:848 src/misc/configuration.c:794
+#: src/libvlc.c:888 src/misc/configuration.c:798
 msgid "string"
 msgstr "napis"
 
-#: src/libvlc.c:851 src/misc/configuration.c:779
+#: src/libvlc.c:891 src/misc/configuration.c:783
 msgid "integer"
 msgstr "liczba całkowita"
 
-#: src/libvlc.c:854 src/misc/configuration.c:786
+#: src/libvlc.c:894 src/misc/configuration.c:790
 msgid "float"
 msgstr "liczba zmiennoprz."
 
-#: src/libvlc.c:860
-msgid " (default: enabled)"
+#: src/libvlc.c:900
+msgid " (default enabled)"
 msgstr ""
 
-#: src/libvlc.c:861
-msgid " (default: disabled)"
+#: src/libvlc.c:901
+msgid " (default disabled)"
 msgstr ""
 
-#: src/libvlc.c:915
+#: src/libvlc.c:955
 #, fuzzy
 msgid ""
 "\n"
@@ -76,7 +76,7 @@ msgstr ""
 "  vlc:pause                      zatrzymanie odtwarzania obiektów listy\n"
 "  vlc:quit                       wyjście z VLC"
 
-#: src/libvlc.c:936 src/libvlc.c:985 src/libvlc.c:1009 src/libvlc.c:1028
+#: src/libvlc.c:976 src/libvlc.c:1025 src/libvlc.c:1049 src/libvlc.c:1068
 #, fuzzy
 msgid ""
 "\n"
@@ -86,19 +86,19 @@ msgstr ""
 "Naciśnij klawisz ENTER aby kontynuować..."
 
 #. Usage
-#: src/libvlc.c:959
+#: src/libvlc.c:999
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options] [parameters] [file]...\n"
 "\n"
 msgstr "Użycie: %s [opcje] [parametry] [plik]...\n"
 
-#: src/libvlc.c:962
+#: src/libvlc.c:1002
 #, fuzzy
 msgid "[module]              [description]\n"
 msgstr "[moduł]               [opis]"
 
-#: src/libvlc.c:1003
+#: src/libvlc.c:1043
 #, fuzzy
 msgid ""
 "This program comes with NO WARRANTY, to the extent permitted by law.\n"
@@ -115,7 +115,7 @@ msgstr ""
 #. * libvlc.h: main libvlc header
 #. *****************************************************************************
 #. * Copyright (C) 1998-2002 VideoLAN
-#. * $Id: pl.po,v 1.2 2002/06/01 12:32:01 sam Exp $
+#. * $Id: pl.po,v 1.3 2002/06/01 16:45:34 sam Exp $
 #. *
 #. * Authors: Vincent Seguin <seguin@via.ecp.fr>
 #. *          Samuel Hocevar <sam@zoy.org>
@@ -766,12 +766,12 @@ msgid "Playlist"
 msgstr "Lista odtwarzania"
 
 #. Misc options
-#: plugins/a52/a52.c:81 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81
+#: plugins/a52/a52.c:83 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81
 #: plugins/dummy/dummy.c:51 plugins/fb/fb.c:70 plugins/filter/deinterlace.c:50
 #: plugins/filter/distort.c:50 plugins/filter/transform.c:51
 #: plugins/filter/wall.c:45 plugins/ggi/ggi.c:64 plugins/gtk/gnome.c:73
 #: plugins/gtk/gtk.c:71 plugins/mad/mad_adec.c:66 plugins/mga/xmga.c:106
-#: plugins/mpeg_vdec/video_parser.c:95 plugins/text/logger.c:86
+#: plugins/mpeg_vdec/video_parser.c:96 plugins/text/logger.c:86
 #: plugins/win32/win32.cpp:48 plugins/x11/x11.c:55 plugins/x11/xvideo.c:65
 #: src/libvlc.h:366
 msgid "Miscellaneous"
@@ -807,19 +807,19 @@ msgstr "Wy
 msgid "print build information"
 msgstr "Wyświetl informacje o wersji"
 
-#: src/misc/configuration.c:779
+#: src/misc/configuration.c:783
 msgid "boolean"
 msgstr "zm. logiczna"
 
 #. ****************************************************************************
 #. * Build configuration structure.
 #. ****************************************************************************
-#: plugins/a52/a52.c:72
+#: plugins/a52/a52.c:74
 #, fuzzy
 msgid "A/52 dynamic range compression"
 msgstr "wyłączona kompresja dynamicznego zakresu A/52"
 
-#: plugins/a52/a52.c:74
+#: plugins/a52/a52.c:76
 #, fuzzy
 msgid ""
 "Dynamic range compression makes the loud sounds softer, and the soft sounds "
@@ -833,7 +833,7 @@ msgstr ""
 "Jeśli zostanie wyłączona kompresja dynamicznego zakresu będzie to lepiej "
 "pasująca opcja w przypadku sali kinowej lub pokoju akustycznego."
 
-#: plugins/a52/a52.c:86
+#: plugins/a52/a52.c:88
 msgid "a52 ATSC A/52 aka AC-3 audio decoder module"
 msgstr "moduł dekodera dźwięku a52 ATSC A/52 aka AC-3"
 
@@ -889,18 +889,18 @@ msgstr "konwersje z I420,IYUV,YV12 do RGB,RV15,RV16,RV24,RV32"
 msgid "MMX I420,IYUV,YV12 to RV15,RV16,RV24,RV32 conversions"
 msgstr "konwersje z MMX I420,IYUV,YV12 do RV15,RV16,RV24,RV32"
 
-#: plugins/chroma/i420_ymga.c:55 plugins/chroma/i420_yuy2.c:69
+#: plugins/chroma/i420_ymga.c:55 plugins/chroma/i420_yuy2.c:74
 #: plugins/chroma/i422_yuy2.c:68
 msgid "conversions from "
 msgstr "konwersje z "
 
 #: plugins/chroma/i420_ymga.c:55 plugins/chroma/i420_ymga.c:58
-#: plugins/chroma/i420_yuy2.c:69 plugins/chroma/i420_yuy2.c:72
+#: plugins/chroma/i420_yuy2.c:74 plugins/chroma/i420_yuy2.c:77
 #: plugins/chroma/i422_yuy2.c:68 plugins/chroma/i422_yuy2.c:71
 msgid " to "
 msgstr " do "
 
-#: plugins/chroma/i420_ymga.c:58 plugins/chroma/i420_yuy2.c:72
+#: plugins/chroma/i420_ymga.c:58 plugins/chroma/i420_yuy2.c:77
 #: plugins/chroma/i422_yuy2.c:71
 msgid "MMX conversions from "
 msgstr "konwersje MMX z "
@@ -1860,11 +1860,11 @@ msgstr "Rozdzia
 #. ****************************************************************************
 #. * Build configuration tree.
 #. ****************************************************************************
-#: plugins/idct/idct.c:47 plugins/mpeg_vdec/video_parser.c:70
+#: plugins/idct/idct.c:47 plugins/mpeg_vdec/video_parser.c:71
 msgid "IDCT module"
 msgstr "moduł IDCT"
 
-#: plugins/idct/idctaltivec.c:49
+#: plugins/idct/idctaltivec.c:51
 #, fuzzy
 msgid "AltiVec IDCT module"
 msgstr "moduł Altivec IDCT"
@@ -1985,7 +1985,7 @@ msgstr ""
 msgid "X11 MGA module"
 msgstr "moduł X11 MGA"
 
-#: plugins/motion/motion.c:45 plugins/mpeg_vdec/video_parser.c:76
+#: plugins/motion/motion.c:45 plugins/mpeg_vdec/video_parser.c:77
 msgid "motion compensation module"
 msgstr "moduł kompensacji ruchu"
 
@@ -1993,7 +1993,7 @@ msgstr "modu
 msgid "3D Now! motion compensation module"
 msgstr "moduł kompensacji ruchu 3D Now!"
 
-#: plugins/motion/motionaltivec.c:48
+#: plugins/motion/motionaltivec.c:50
 msgid "AltiVec motion compensation module"
 msgstr "moduł kompensacji ruchu AltiVec"
 
@@ -2025,7 +2025,7 @@ msgstr "Wej
 msgid "ISO 13818-1 MPEG Transport Stream input (libdvbpsi)"
 msgstr "Wejście transportu strumienia ISO 13818-1 MPEG (libdvbpsi)"
 
-#: plugins/mpeg_vdec/video_parser.c:72
+#: plugins/mpeg_vdec/video_parser.c:73
 #, fuzzy
 msgid ""
 "This option allows you to select the IDCT module used by this video decoder. "
@@ -2035,7 +2035,7 @@ msgstr ""
 "Należy zauważyć, że domyślnym zachowaniem jest automatyczny wybór "
 "najlepszego dostępnego modułu."
 
-#: plugins/mpeg_vdec/video_parser.c:78
+#: plugins/mpeg_vdec/video_parser.c:79
 #, fuzzy
 msgid ""
 "This option allows you to select the motion compensation module used by this "
@@ -2047,11 +2047,11 @@ msgstr ""
 "Należy zauważyć, że domyślnym zachowaniem jest automatyczny wybór "
 "najlepszego dostępnego modułu."
 
-#: plugins/mpeg_vdec/video_parser.c:82
+#: plugins/mpeg_vdec/video_parser.c:83
 msgid "use additional processors"
 msgstr "używanie dodatkowych procesorów"
 
-#: plugins/mpeg_vdec/video_parser.c:84
+#: plugins/mpeg_vdec/video_parser.c:85
 msgid ""
 "This video decoder can benefit from a multiprocessor computer. If you have "
 "one, you can specify the number of processors here."
@@ -2059,11 +2059,11 @@ msgstr ""
 "Tek dekoder obrazu przynosi korzyści przy komputerze wieloprocesorowym.Jeśli "
 "posiadasz taki, można tutaj określić liczbę procesorów."
 
-#: plugins/mpeg_vdec/video_parser.c:87
+#: plugins/mpeg_vdec/video_parser.c:88
 msgid "force synchro algorithm {I|I+|IP|IP+|IPB}"
 msgstr "wymuszanie algorytmu synchronizacji {I|I+|IP|IP+|IPB}"
 
-#: plugins/mpeg_vdec/video_parser.c:89
+#: plugins/mpeg_vdec/video_parser.c:90
 msgid ""
 "This allows you to force the synchro algorithm, by directly selecting the "
 "types of picture you want to decode. Please bear in mind that if you select "
@@ -2074,7 +2074,7 @@ msgstr ""
 "wybór typów dekodowanego obrazu. Należy zwrócić uwagę, że wybranie więcej "
 "obrazów niż procesor jest zdolny zdekodować nie daje niczego."
 
-#: plugins/mpeg_vdec/video_parser.c:106
+#: plugins/mpeg_vdec/video_parser.c:107
 msgid "MPEG I/II video decoder module"
 msgstr "moduł dekodera obrazu MPEG I/II"
 
diff --git a/po/ru.po b/po/ru.po
index ba1ef2ca60..6bdc723659 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-vlc\n"
-"POT-Creation-Date: 2002-05-31 11:45+0200\n"
+"POT-Creation-Date: 2002-06-01 18:43+0200\n"
 "PO-Revision-Date: 2001-02-19 19:58+03:00\n"
 "Last-Translator: Valek Filippov <frob@df.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -14,13 +14,13 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/libvlc.c:270
+#: src/libvlc.c:277
 #, c-format
 msgid "Usage: %s [options] [parameters] [file]...\n"
 msgstr ""
 
 #. Print module name
-#: src/libvlc.c:828
+#: src/libvlc.c:868
 #, c-format
 msgid ""
 "%s module options:\n"
@@ -28,27 +28,27 @@ msgid ""
 msgstr ""
 
 #. We could also have "=<" here
-#: src/libvlc.c:848 src/misc/configuration.c:794
+#: src/libvlc.c:888 src/misc/configuration.c:798
 msgid "string"
 msgstr ""
 
-#: src/libvlc.c:851 src/misc/configuration.c:779
+#: src/libvlc.c:891 src/misc/configuration.c:783
 msgid "integer"
 msgstr ""
 
-#: src/libvlc.c:854 src/misc/configuration.c:786
+#: src/libvlc.c:894 src/misc/configuration.c:790
 msgid "float"
 msgstr ""
 
-#: src/libvlc.c:860
-msgid " (default: enabled)"
+#: src/libvlc.c:900
+msgid " (default enabled)"
 msgstr ""
 
-#: src/libvlc.c:861
-msgid " (default: disabled)"
+#: src/libvlc.c:901
+msgid " (default disabled)"
 msgstr ""
 
-#: src/libvlc.c:915
+#: src/libvlc.c:955
 msgid ""
 "\n"
 "Playlist items:\n"
@@ -64,25 +64,25 @@ msgid ""
 "  vlc:quit                       quit VLC\n"
 msgstr ""
 
-#: src/libvlc.c:936 src/libvlc.c:985 src/libvlc.c:1009 src/libvlc.c:1028
+#: src/libvlc.c:976 src/libvlc.c:1025 src/libvlc.c:1049 src/libvlc.c:1068
 msgid ""
 "\n"
 "Press the RETURN key to continue...\n"
 msgstr ""
 
 #. Usage
-#: src/libvlc.c:959
+#: src/libvlc.c:999
 #, c-format
 msgid ""
 "Usage: %s [options] [parameters] [file]...\n"
 "\n"
 msgstr ""
 
-#: src/libvlc.c:962
+#: src/libvlc.c:1002
 msgid "[module]              [description]\n"
 msgstr ""
 
-#: src/libvlc.c:1003
+#: src/libvlc.c:1043
 msgid ""
 "This program comes with NO WARRANTY, to the extent permitted by law.\n"
 "You may redistribute it under the terms of the GNU General Public License;\n"
@@ -94,7 +94,7 @@ msgstr ""
 #. * libvlc.h: main libvlc header
 #. *****************************************************************************
 #. * Copyright (C) 1998-2002 VideoLAN
-#. * $Id: ru.po,v 1.9 2002/06/01 12:32:01 sam Exp $
+#. * $Id: ru.po,v 1.10 2002/06/01 16:45:34 sam Exp $
 #. *
 #. * Authors: Vincent Seguin <seguin@via.ecp.fr>
 #. *          Samuel Hocevar <sam@zoy.org>
@@ -635,12 +635,12 @@ msgid "Playlist"
 msgstr "óĐÉÓĎË ÄĚŃ ×ĎÓĐŇĎÉÚ×ĹÄĹÎÉŃ"
 
 #. Misc options
-#: plugins/a52/a52.c:81 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81
+#: plugins/a52/a52.c:83 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81
 #: plugins/dummy/dummy.c:51 plugins/fb/fb.c:70 plugins/filter/deinterlace.c:50
 #: plugins/filter/distort.c:50 plugins/filter/transform.c:51
 #: plugins/filter/wall.c:45 plugins/ggi/ggi.c:64 plugins/gtk/gnome.c:73
 #: plugins/gtk/gtk.c:71 plugins/mad/mad_adec.c:66 plugins/mga/xmga.c:106
-#: plugins/mpeg_vdec/video_parser.c:95 plugins/text/logger.c:86
+#: plugins/mpeg_vdec/video_parser.c:96 plugins/text/logger.c:86
 #: plugins/win32/win32.cpp:48 plugins/x11/x11.c:55 plugins/x11/xvideo.c:65
 #: src/libvlc.h:366
 msgid "Miscellaneous"
@@ -674,18 +674,18 @@ msgstr ""
 msgid "print build information"
 msgstr ""
 
-#: src/misc/configuration.c:779
+#: src/misc/configuration.c:783
 msgid "boolean"
 msgstr ""
 
 #. ****************************************************************************
 #. * Build configuration structure.
 #. ****************************************************************************
-#: plugins/a52/a52.c:72
+#: plugins/a52/a52.c:74
 msgid "A/52 dynamic range compression"
 msgstr ""
 
-#: plugins/a52/a52.c:74
+#: plugins/a52/a52.c:76
 msgid ""
 "Dynamic range compression makes the loud sounds softer, and the soft sounds "
 "louder, so you can more easily listen to the stream in a noisy environment "
@@ -693,7 +693,7 @@ msgid ""
 "playback will be more adapted to a movie theater or a listening room."
 msgstr ""
 
-#: plugins/a52/a52.c:86
+#: plugins/a52/a52.c:88
 msgid "a52 ATSC A/52 aka AC-3 audio decoder module"
 msgstr ""
 
@@ -749,18 +749,18 @@ msgstr ""
 msgid "MMX I420,IYUV,YV12 to RV15,RV16,RV24,RV32 conversions"
 msgstr ""
 
-#: plugins/chroma/i420_ymga.c:55 plugins/chroma/i420_yuy2.c:69
+#: plugins/chroma/i420_ymga.c:55 plugins/chroma/i420_yuy2.c:74
 #: plugins/chroma/i422_yuy2.c:68
 msgid "conversions from "
 msgstr ""
 
 #: plugins/chroma/i420_ymga.c:55 plugins/chroma/i420_ymga.c:58
-#: plugins/chroma/i420_yuy2.c:69 plugins/chroma/i420_yuy2.c:72
+#: plugins/chroma/i420_yuy2.c:74 plugins/chroma/i420_yuy2.c:77
 #: plugins/chroma/i422_yuy2.c:68 plugins/chroma/i422_yuy2.c:71
 msgid " to "
 msgstr ""
 
-#: plugins/chroma/i420_ymga.c:58 plugins/chroma/i420_yuy2.c:72
+#: plugins/chroma/i420_ymga.c:58 plugins/chroma/i420_yuy2.c:77
 #: plugins/chroma/i422_yuy2.c:71
 msgid "MMX conversions from "
 msgstr ""
@@ -1717,11 +1717,11 @@ msgstr ""
 #. ****************************************************************************
 #. * Build configuration tree.
 #. ****************************************************************************
-#: plugins/idct/idct.c:47 plugins/mpeg_vdec/video_parser.c:70
+#: plugins/idct/idct.c:47 plugins/mpeg_vdec/video_parser.c:71
 msgid "IDCT module"
 msgstr ""
 
-#: plugins/idct/idctaltivec.c:49
+#: plugins/idct/idctaltivec.c:51
 msgid "AltiVec IDCT module"
 msgstr ""
 
@@ -1829,7 +1829,7 @@ msgstr ""
 msgid "X11 MGA module"
 msgstr ""
 
-#: plugins/motion/motion.c:45 plugins/mpeg_vdec/video_parser.c:76
+#: plugins/motion/motion.c:45 plugins/mpeg_vdec/video_parser.c:77
 msgid "motion compensation module"
 msgstr ""
 
@@ -1837,7 +1837,7 @@ msgstr ""
 msgid "3D Now! motion compensation module"
 msgstr ""
 
-#: plugins/motion/motionaltivec.c:48
+#: plugins/motion/motionaltivec.c:50
 msgid "AltiVec motion compensation module"
 msgstr ""
 
@@ -1869,34 +1869,34 @@ msgstr ""
 msgid "ISO 13818-1 MPEG Transport Stream input (libdvbpsi)"
 msgstr ""
 
-#: plugins/mpeg_vdec/video_parser.c:72
+#: plugins/mpeg_vdec/video_parser.c:73
 msgid ""
 "This option allows you to select the IDCT module used by this video decoder. "
 "The default behavior is to automatically select the best module available."
 msgstr ""
 
-#: plugins/mpeg_vdec/video_parser.c:78
+#: plugins/mpeg_vdec/video_parser.c:79
 msgid ""
 "This option allows you to select the motion compensation module used by this "
 "video decoder. The default behavior is to automatically select the best "
 "module available."
 msgstr ""
 
-#: plugins/mpeg_vdec/video_parser.c:82
+#: plugins/mpeg_vdec/video_parser.c:83
 msgid "use additional processors"
 msgstr ""
 
-#: plugins/mpeg_vdec/video_parser.c:84
+#: plugins/mpeg_vdec/video_parser.c:85
 msgid ""
 "This video decoder can benefit from a multiprocessor computer. If you have "
 "one, you can specify the number of processors here."
 msgstr ""
 
-#: plugins/mpeg_vdec/video_parser.c:87
+#: plugins/mpeg_vdec/video_parser.c:88
 msgid "force synchro algorithm {I|I+|IP|IP+|IPB}"
 msgstr ""
 
-#: plugins/mpeg_vdec/video_parser.c:89
+#: plugins/mpeg_vdec/video_parser.c:90
 msgid ""
 "This allows you to force the synchro algorithm, by directly selecting the "
 "types of picture you want to decode. Please bear in mind that if you select "
@@ -1904,7 +1904,7 @@ msgid ""
 "anything."
 msgstr ""
 
-#: plugins/mpeg_vdec/video_parser.c:106
+#: plugins/mpeg_vdec/video_parser.c:107
 msgid "MPEG I/II video decoder module"
 msgstr ""
 
diff --git a/po/vlc.pot b/po/vlc.pot
index 4ee56cb6eb..6e7e6eb8eb 100644
--- a/po/vlc.pot
+++ b/po/vlc.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-05-31 11:45+0200\n"
+"POT-Creation-Date: 2002-06-01 18:43+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,13 +14,13 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/libvlc.c:270
+#: src/libvlc.c:277
 #, c-format
 msgid "Usage: %s [options] [parameters] [file]...\n"
 msgstr ""
 
 #. Print module name
-#: src/libvlc.c:828
+#: src/libvlc.c:868
 #, c-format
 msgid ""
 "%s module options:\n"
@@ -28,27 +28,27 @@ msgid ""
 msgstr ""
 
 #. We could also have "=<" here
-#: src/libvlc.c:848 src/misc/configuration.c:794
+#: src/libvlc.c:888 src/misc/configuration.c:798
 msgid "string"
 msgstr ""
 
-#: src/libvlc.c:851 src/misc/configuration.c:779
+#: src/libvlc.c:891 src/misc/configuration.c:783
 msgid "integer"
 msgstr ""
 
-#: src/libvlc.c:854 src/misc/configuration.c:786
+#: src/libvlc.c:894 src/misc/configuration.c:790
 msgid "float"
 msgstr ""
 
-#: src/libvlc.c:860
-msgid " (default: enabled)"
+#: src/libvlc.c:900
+msgid " (default enabled)"
 msgstr ""
 
-#: src/libvlc.c:861
-msgid " (default: disabled)"
+#: src/libvlc.c:901
+msgid " (default disabled)"
 msgstr ""
 
-#: src/libvlc.c:915
+#: src/libvlc.c:955
 msgid ""
 "\n"
 "Playlist items:\n"
@@ -64,25 +64,25 @@ msgid ""
 "  vlc:quit                       quit VLC\n"
 msgstr ""
 
-#: src/libvlc.c:936 src/libvlc.c:985 src/libvlc.c:1009 src/libvlc.c:1028
+#: src/libvlc.c:976 src/libvlc.c:1025 src/libvlc.c:1049 src/libvlc.c:1068
 msgid ""
 "\n"
 "Press the RETURN key to continue...\n"
 msgstr ""
 
 #. Usage
-#: src/libvlc.c:959
+#: src/libvlc.c:999
 #, c-format
 msgid ""
 "Usage: %s [options] [parameters] [file]...\n"
 "\n"
 msgstr ""
 
-#: src/libvlc.c:962
+#: src/libvlc.c:1002
 msgid "[module]              [description]\n"
 msgstr ""
 
-#: src/libvlc.c:1003
+#: src/libvlc.c:1043
 msgid ""
 "This program comes with NO WARRANTY, to the extent permitted by law.\n"
 "You may redistribute it under the terms of the GNU General Public License;\n"
@@ -94,7 +94,7 @@ msgstr ""
 #. * libvlc.h: main libvlc header
 #. *****************************************************************************
 #. * Copyright (C) 1998-2002 VideoLAN
-#. * $Id: vlc.pot,v 1.9 2002/06/01 12:32:01 sam Exp $
+#. * $Id: vlc.pot,v 1.10 2002/06/01 16:45:34 sam Exp $
 #. *
 #. * Authors: Vincent Seguin <seguin@via.ecp.fr>
 #. *          Samuel Hocevar <sam@zoy.org>
@@ -635,12 +635,12 @@ msgid "Playlist"
 msgstr ""
 
 #. Misc options
-#: plugins/a52/a52.c:81 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81
+#: plugins/a52/a52.c:83 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81
 #: plugins/dummy/dummy.c:51 plugins/fb/fb.c:70 plugins/filter/deinterlace.c:50
 #: plugins/filter/distort.c:50 plugins/filter/transform.c:51
 #: plugins/filter/wall.c:45 plugins/ggi/ggi.c:64 plugins/gtk/gnome.c:73
 #: plugins/gtk/gtk.c:71 plugins/mad/mad_adec.c:66 plugins/mga/xmga.c:106
-#: plugins/mpeg_vdec/video_parser.c:95 plugins/text/logger.c:86
+#: plugins/mpeg_vdec/video_parser.c:96 plugins/text/logger.c:86
 #: plugins/win32/win32.cpp:48 plugins/x11/x11.c:55 plugins/x11/xvideo.c:65
 #: src/libvlc.h:366
 msgid "Miscellaneous"
@@ -674,18 +674,18 @@ msgstr ""
 msgid "print build information"
 msgstr ""
 
-#: src/misc/configuration.c:779
+#: src/misc/configuration.c:783
 msgid "boolean"
 msgstr ""
 
 #. ****************************************************************************
 #. * Build configuration structure.
 #. ****************************************************************************
-#: plugins/a52/a52.c:72
+#: plugins/a52/a52.c:74
 msgid "A/52 dynamic range compression"
 msgstr ""
 
-#: plugins/a52/a52.c:74
+#: plugins/a52/a52.c:76
 msgid ""
 "Dynamic range compression makes the loud sounds softer, and the soft sounds "
 "louder, so you can more easily listen to the stream in a noisy environment "
@@ -693,7 +693,7 @@ msgid ""
 "playback will be more adapted to a movie theater or a listening room."
 msgstr ""
 
-#: plugins/a52/a52.c:86
+#: plugins/a52/a52.c:88
 msgid "a52 ATSC A/52 aka AC-3 audio decoder module"
 msgstr ""
 
@@ -749,18 +749,18 @@ msgstr ""
 msgid "MMX I420,IYUV,YV12 to RV15,RV16,RV24,RV32 conversions"
 msgstr ""
 
-#: plugins/chroma/i420_ymga.c:55 plugins/chroma/i420_yuy2.c:69
+#: plugins/chroma/i420_ymga.c:55 plugins/chroma/i420_yuy2.c:74
 #: plugins/chroma/i422_yuy2.c:68
 msgid "conversions from "
 msgstr ""
 
 #: plugins/chroma/i420_ymga.c:55 plugins/chroma/i420_ymga.c:58
-#: plugins/chroma/i420_yuy2.c:69 plugins/chroma/i420_yuy2.c:72
+#: plugins/chroma/i420_yuy2.c:74 plugins/chroma/i420_yuy2.c:77
 #: plugins/chroma/i422_yuy2.c:68 plugins/chroma/i422_yuy2.c:71
 msgid " to "
 msgstr ""
 
-#: plugins/chroma/i420_ymga.c:58 plugins/chroma/i420_yuy2.c:72
+#: plugins/chroma/i420_ymga.c:58 plugins/chroma/i420_yuy2.c:77
 #: plugins/chroma/i422_yuy2.c:71
 msgid "MMX conversions from "
 msgstr ""
@@ -1692,11 +1692,11 @@ msgstr ""
 #. ****************************************************************************
 #. * Build configuration tree.
 #. ****************************************************************************
-#: plugins/idct/idct.c:47 plugins/mpeg_vdec/video_parser.c:70
+#: plugins/idct/idct.c:47 plugins/mpeg_vdec/video_parser.c:71
 msgid "IDCT module"
 msgstr ""
 
-#: plugins/idct/idctaltivec.c:49
+#: plugins/idct/idctaltivec.c:51
 msgid "AltiVec IDCT module"
 msgstr ""
 
@@ -1804,7 +1804,7 @@ msgstr ""
 msgid "X11 MGA module"
 msgstr ""
 
-#: plugins/motion/motion.c:45 plugins/mpeg_vdec/video_parser.c:76
+#: plugins/motion/motion.c:45 plugins/mpeg_vdec/video_parser.c:77
 msgid "motion compensation module"
 msgstr ""
 
@@ -1812,7 +1812,7 @@ msgstr ""
 msgid "3D Now! motion compensation module"
 msgstr ""
 
-#: plugins/motion/motionaltivec.c:48
+#: plugins/motion/motionaltivec.c:50
 msgid "AltiVec motion compensation module"
 msgstr ""
 
@@ -1844,34 +1844,34 @@ msgstr ""
 msgid "ISO 13818-1 MPEG Transport Stream input (libdvbpsi)"
 msgstr ""
 
-#: plugins/mpeg_vdec/video_parser.c:72
+#: plugins/mpeg_vdec/video_parser.c:73
 msgid ""
 "This option allows you to select the IDCT module used by this video decoder. "
 "The default behavior is to automatically select the best module available."
 msgstr ""
 
-#: plugins/mpeg_vdec/video_parser.c:78
+#: plugins/mpeg_vdec/video_parser.c:79
 msgid ""
 "This option allows you to select the motion compensation module used by this "
 "video decoder. The default behavior is to automatically select the best "
 "module available."
 msgstr ""
 
-#: plugins/mpeg_vdec/video_parser.c:82
+#: plugins/mpeg_vdec/video_parser.c:83
 msgid "use additional processors"
 msgstr ""
 
-#: plugins/mpeg_vdec/video_parser.c:84
+#: plugins/mpeg_vdec/video_parser.c:85
 msgid ""
 "This video decoder can benefit from a multiprocessor computer. If you have "
 "one, you can specify the number of processors here."
 msgstr ""
 
-#: plugins/mpeg_vdec/video_parser.c:87
+#: plugins/mpeg_vdec/video_parser.c:88
 msgid "force synchro algorithm {I|I+|IP|IP+|IPB}"
 msgstr ""
 
-#: plugins/mpeg_vdec/video_parser.c:89
+#: plugins/mpeg_vdec/video_parser.c:90
 msgid ""
 "This allows you to force the synchro algorithm, by directly selecting the "
 "types of picture you want to decode. Please bear in mind that if you select "
@@ -1879,7 +1879,7 @@ msgid ""
 "anything."
 msgstr ""
 
-#: plugins/mpeg_vdec/video_parser.c:106
+#: plugins/mpeg_vdec/video_parser.c:107
 msgid "MPEG I/II video decoder module"
 msgstr ""
 
diff --git a/src/interface/intf_eject.c b/src/interface/intf_eject.c
index f9b69ba501..ad220f6fdc 100644
--- a/src/interface/intf_eject.c
+++ b/src/interface/intf_eject.c
@@ -2,7 +2,7 @@
  * intf_eject.c: CD/DVD-ROM ejection handling functions
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: intf_eject.c,v 1.13 2002/06/01 12:32:01 sam Exp $
+ * $Id: intf_eject.c,v 1.14 2002/06/01 16:45:35 sam Exp $
  *
  * Author: Julien Blache <jb@technologeek.org> for the Linux part
  *               with code taken from the Linux "eject" command
@@ -167,11 +167,9 @@ int intf_Eject( vlc_object_t *p_this, const char *psz_device )
     /* Win2K ejection code */
     if ( GetVersion() < 0x80000000 )
     {
-        intf_WarnMsg (3, "intf: win2k ejecting procedure launched") ;
-        
         wsprintf(psz_drive_id, psz_volume_format, psz_device) ;
          
-        intf_WarnMsg(3, "intf: Ejecting drive %s", psz_drive_id) ;
+        msg_Dbg( p_this, "ejecting drive %s", psz_drive_id );
         
         /* Create the file handle */ 
         h_drive = CreateFile(  psz_drive_id, 
@@ -184,7 +182,8 @@ int intf_Eject( vlc_object_t *p_this, const char *psz_device )
 
         if (h_drive == INVALID_HANDLE_VALUE )
         {
-            intf_ErrMsg ("intf error: (Win32) couldn't create handle for device %s", psz_device) ;
+            msg_Err( p_this, "could not create handle for device %s",
+                             psz_device );
         }
 
         i_ret = DeviceIoControl ( h_drive, 
@@ -214,7 +213,7 @@ int intf_Eject( vlc_object_t *p_this, const char *psz_device )
                                  &dw_result, 0) ;
 
         CloseHandle (h_drive) ;
-	return (i_ret) ;
+        return (i_ret) ;
     }
 #else   /* WIN32 */
     
diff --git a/src/libvlc.c b/src/libvlc.c
index 8cd2a132a2..8f49c3673b 100644
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -4,7 +4,7 @@
  * and spawns threads.
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: libvlc.c,v 1.2 2002/06/01 14:31:32 sam Exp $
+ * $Id: libvlc.c,v 1.3 2002/06/01 16:45:34 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -103,9 +103,11 @@ static void ListModules   ( vlc_object_t * );
 static void Version       ( void );
 static void Build         ( void );
 
+#ifndef WIN32
 static void InitSignalHandler   ( void );
 static void SimpleSignalHandler ( int i_signal );
 static void FatalSignalHandler  ( int i_signal );
+#endif
 
 #ifdef WIN32
 static void ShowConsole   ( void );
@@ -144,7 +146,9 @@ vlc_t * vlc_create( void )
     vlc_mutex_init( p_vlc->p_this, &p_vlc->structure_lock );
 
     /* Set signal handling policy for all threads */
+#ifndef WIN32
     InitSignalHandler( );
+#endif
 
     /* Store our newly allocated structure in the global list */
     vlc_mutex_lock( p_vlc->p_global_lock );
@@ -1082,6 +1086,7 @@ static void ShowConsole( void )
 }
 #endif
 
+#ifndef WIN32
 /*****************************************************************************
  * InitSignalHandler: system signal handler initialization
  *****************************************************************************
@@ -1091,7 +1096,6 @@ static void ShowConsole( void )
  *****************************************************************************/
 static void InitSignalHandler( void )
 {
-#ifndef WIN32
     /* Termination signals */
     signal( SIGINT,  FatalSignalHandler );
     signal( SIGHUP,  FatalSignalHandler );
@@ -1100,7 +1104,6 @@ static void InitSignalHandler( void )
     /* Other signals */
     signal( SIGALRM, SimpleSignalHandler );
     signal( SIGPIPE, SimpleSignalHandler );
-#endif
 }
 
 /*****************************************************************************
@@ -1156,11 +1159,9 @@ static void FatalSignalHandler( int i_signal )
     else if( mdate() > abort_time + 1000000 )
     {
         /* If user asks again 1 second later, die badly */
-#ifndef WIN32
         signal( SIGINT,  SIG_IGN );
         signal( SIGHUP,  SIG_IGN );
         signal( SIGQUIT, SIG_IGN );
-#endif
 
         for( i_index = 0 ; i_index < i_vlc ; i_index++ )
         {
@@ -1173,4 +1174,5 @@ static void FatalSignalHandler( int i_signal )
 
     vlc_mutex_unlock( &global_lock );
 }
+#endif
 
diff --git a/src/misc/modules_plugin.h b/src/misc/modules_plugin.h
index c0723d75e0..ae5db6fd40 100644
--- a/src/misc/modules_plugin.h
+++ b/src/misc/modules_plugin.h
@@ -2,7 +2,7 @@
  * modules_plugin.h : Plugin management functions used by the core application.
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: modules_plugin.h,v 1.28 2002/06/01 12:32:01 sam Exp $
+ * $Id: modules_plugin.h,v 1.29 2002/06/01 16:45:35 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
diff --git a/src/misc/threads.c b/src/misc/threads.c
index 16ba3c5476..35a2b6626d 100644
--- a/src/misc/threads.c
+++ b/src/misc/threads.c
@@ -2,7 +2,7 @@
  * threads.c : threads implementation for the VideoLAN client
  *****************************************************************************
  * Copyright (C) 1999, 2000, 2001, 2002 VideoLAN
- * $Id: threads.c,v 1.2 2002/06/01 14:31:32 sam Exp $
+ * $Id: threads.c,v 1.3 2002/06/01 16:45:35 sam Exp $
  *
  * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -155,7 +155,6 @@ int vlc_threads_end( void )
 #endif
 }
 
-static int mutexes = 0;
 /*****************************************************************************
  * vlc_mutex_init: initialize a mutex
  *****************************************************************************/
@@ -402,12 +401,15 @@ int __vlc_thread_create( vlc_object_t *p_this, char * psz_file, int i_line,
     i_ret = 0;
     
 #elif defined( WIN32 )
-    unsigned threadID;
-    /* When using the MSVCRT C library you have to use the _beginthreadex
-     * function instead of CreateThread, otherwise you'll end up with memory
-     * leaks and the signal functions not working */
-    p_this->thread_id = (HANDLE)_beginthreadex( NULL, 0, (PTHREAD_START) func, 
-                                                (void *)p_this, 0, &threadID );
+    {
+        unsigned threadID;
+        /* When using the MSVCRT C library you have to use the _beginthreadex
+         * function instead of CreateThread, otherwise you'll end up with memory
+         * leaks and the signal functions not working */
+        p_this->thread_id =
+                (HANDLE)_beginthreadex( NULL, 0, (PTHREAD_START) func, 
+                                        (void *)p_this, 0, &threadID );
+    }
     
     i_ret = ( p_this->thread_id ? 0 : 1 );
 
diff --git a/src/misc/win32_specific.c b/src/misc/win32_specific.c
index 8cf61b17ee..38a536d991 100644
--- a/src/misc/win32_specific.c
+++ b/src/misc/win32_specific.c
@@ -2,7 +2,7 @@
  * win32_specific.c: Win32 specific features 
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: win32_specific.c,v 1.9 2002/06/01 14:31:32 sam Exp $
+ * $Id: win32_specific.c,v 1.10 2002/06/01 16:45:35 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Gildas Bazin <gbazin@netcourrier.com>
@@ -66,7 +66,7 @@ void system_Configure( vlc_object_t *p_this )
 /*****************************************************************************
  * system_End: terminate winsock.
  *****************************************************************************/
-void system_End( vlc_object_t * )
+void system_End( vlc_object_t *p_this )
 {
     WSACleanup();
 }