103 files changed, 494 insertions, 521 deletions
diff --git a/Changelog b/Changelog
index 92e6c122d5..80226b871d 100644
--- a/Changelog
+++ b/Changelog
@@ -28,7 +28,7 @@ MPlayer (1.0)
     * support MOV subtitle format
     * support for attachments in lavf demuxer
     * support for chapters in lavf demuxer
-    * Flac speedup in lavf demuxer
+    * FLAC speedup in lavf demuxer
 
     Filters:
     * vf_ow new overcomplete wavelet denoiser
@@ -56,7 +56,6 @@ MPlayer (1.0)
     libmpeg2:
     * enable Alpha/ARM optimizations in libmpeg2
     * SSE2-optimized IDCT routines from upstream libmpeg2
-    * synced with upstream
 
     Drivers:
     * replace PolypAudio by PulseAudio (-ao pulse)
@@ -82,6 +81,7 @@ MPlayer (1.0)
     * support for DOS-style file:///x:/path paths
     * some new slave commands (check DOCS/tech/slave.txt)
     * misc fixes to libass
+    * libdvdcss updated to 1.2.10, now same as upstream version
 
     Ports:
     * small crash with vo_macosx fixed
@@ -89,7 +89,7 @@ MPlayer (1.0)
     * fix frozen OSD on Mac OS X
     * vo_gl now works with -wid and nVidia drivers on Windows (this is a hack)
     * VIDIX on SuperH.
-    * intentionally break gcc 3.3 on mac os x, please use 4.x
+    * workarounds for AltiVec on Apple gcc 3.3 on Mac OS X dropped
 
   rc2try2:
 
diff --git a/Copyright b/Copyright
index a289df85ea..3589e06be9 100644
--- a/Copyright
+++ b/Copyright
@@ -42,16 +42,16 @@ Copyright:  1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
 License:    GNU General Public License
 
 Name:       libdvdcss
-Version:    Subversion r208 (post 1.2.9 release)
+Version:    1.2.10
 Homepage:   http://developers.videolan.org/libdvdcss/
 Directory:  libdvdcss
-Copyright:  1998-2006 VideoLAN
+Copyright:  1998-2008 VideoLAN
 License:    GNU General Public License
 
 Name:       libdvdread
 Version:    0.9.7 + patches
 Homepage:   http://www.dtek.chalmers.se/groups/dvd/development.shtml
-Directory:  dvdread
+Directory:  libdvdread
 Copyright:  1998, 1999 Eric Smith <eric@brouhaha.com>
             1999 Christian Wolff for convergence integrated media
             2000-2001 Billy Biggs <vektor@dumbterm.net>,
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index 7e06545b80..7396616252 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -7629,6 +7629,21 @@ Read the source for full details.
 .PD 1
 .
 .TP
+.B o=<key>=<value>[,<key>=<value>[,...]]
+Pass AVOptions to libavcodec
+Note, a patch to make the o= unneeded and pass all unknown options through
+the AVOption system is welcome.
+.sp 1
+.RS
+.I EXAMPLE:
+.RE
+.RSs
+.PD 0
+.IPs o=bt=100k
+.PD 1
+.RE
+.
+.TP
 .B acodec=<value>
 audio codec (default: mp2)
 .PD 0
diff --git a/DOCS/man/fr/mplayer.1 b/DOCS/man/fr/mplayer.1
index 9fd199e428..e5d3487023 100644
--- a/DOCS/man/fr/mplayer.1
+++ b/DOCS/man/fr/mplayer.1
@@ -1,4 +1,4 @@
-.\" synced with r27407
+.\" synced with r27466
 .\" Encoding: iso-8859-1
 .\" MPlayer (C) 2000-2008 MPlayer Team
 .\" The English man page was/is done by Gabucino, Diego Biurrun, Jonas Jermann
@@ -8045,6 +8045,22 @@ Pour avoir tous les d�tails lisez le source.
 .PD 1
 .
 .TP
+.B o=<key>=<value>[,<key>=<value>[,...]]
+Passe les � libavcodec les AVOptions.
+Notez que la cr�ation d'une rustine pour que cette option ne soit pas
+n�cessaire, mais qu'� la place, toutes les options inconnues soient pass�es
+au syst�me AVOption est la bienvenue.
+.sp 1
+.RS
+.I EXEMPLE\ :
+.RE
+.RSs
+.PD 0
+.IPs o=bt=100k
+.PD 1
+.RE
+.
+.TP
 .B acodec=<value>
 codec audio (par d�faut\ : mp2)
 .PD 0
diff --git a/DOCS/man/it/mplayer.1 b/DOCS/man/it/mplayer.1
index edfefe7d9e..f22aa15445 100644
--- a/DOCS/man/it/mplayer.1
+++ b/DOCS/man/it/mplayer.1
@@ -1,4 +1,4 @@
-.\" synced with r27348
+.\" synced with r27454
 .\" Encoding: iso-8859-1
 .\" MPlayer (C) 2000-2008 MPlayer Team
 .\" Questa pagina di manuale � stata fatta da Gabucino, Diego Biurrun,
@@ -3618,8 +3618,9 @@ Driver di uscita video molto veloce su schede che lo supportano.
 .RSs
 .IPs <sottodispositivo>
 Seleziona in modo esplicito il sotto dispositivo VIDIX da usare.
-I driver disponibili sono cyberblade, mach64,
-mga_crtc2, mga, nvidia, pm2, pm3, radeon, rage128, sis e unichrome.
+I driver disponibili sono cyberblade, ivtv, mach64,
+mga_crtc2, mga, nvidia, pm2, pm3, radeon, rage128, s3, sh_veu,
+sis_vid e unichrome.
 .RE
 .PD 1
 .
@@ -4113,6 +4114,10 @@ Seleziona esplicitamente il nome del dispositivo fbdev da usare
 .PD 1
 .
 .TP
+.B wii (solo Linux)
+Driver di uscita video specifico per Nintendo Wii/GameCube.
+.
+.TP
 .B 3dfx (solo Linux)
 Driver di uscita video specifico per 3dfx che utilizza direttamente l'hardware
 della scheda sopra a X11.
@@ -8585,26 +8590,16 @@ Sfocatura gaussiana di quantizzazione (default: 0.5), valori pi� grandi
 medieranno la quantizzazione maggiormente nel tempo (cambiamenti pi� lenti).
 .
 .TP
-.B vqcomp=<valore>
+.B vqcomp=<0.0\-1.0>
 Compressione della quantizzazione, vrc_eq dipende da questo (default: 0.5).
-Per esempio, supponendo che sia utilizzata l'equazione di default del rate control,
-se si utilizza vqcomp=1.0 il controllo della dimensione del file alloca per ogni
-fotogramma la quantit� di bit necessari a codificarlo con lo stesso QP.
-Se vqcomp=0.0 il controllo della dimensione del file alloca lo stesso numero di bit
-per ogni fotogramma, cio� CBR preciso.
 .I NOTA:
-Questi sono impostazioni estreme e non dovrebbero mai essere usate.
-La miglior qualit� percepita sar� ottimale tra questi due valori.
+La qualit� percepita sar� ottimale per valori compresi nella gamma.
 .
 .TP
 .B vrc_eq=<equazione>
 equazione principale per il controllo della dimensione del file (ratecontrol)
 .RE
 .RSs
-.IPs "1\ \ \ \ "
-bitrate costante
-.IPs "tex\ \ "
-qualit� costante
 .IPs 1+(tex/\:avgTex-1)*qComp
 approssimativamente l'equazione del vecchio controllo di dimensione
 .IPs tex^qComp
diff --git a/Makefile b/Makefile
index a7998061cf..0ac972f7fa 100644
--- a/Makefile
+++ b/Makefile
@@ -238,15 +238,15 @@ SRCS_COMMON-$(DVBIN)                 += stream/dvb_tune.c \
 SRCS_COMMON-$(DVDNAV)                += stream/stream_dvdnav.c
 SRCS_COMMON-$(DVDREAD)               += stream/stream_dvd.c \
                                         stream/stream_dvd_common.c
-SRCS_COMMON-$(DVDREAD_INTERNAL)      += dvdread/cmd_print.c \
-                                        dvdread/dvd_input.c \
-                                        dvdread/dvd_reader.c \
-                                        dvdread/dvd_udf.c \
-                                        dvdread/ifo_print.c \
-                                        dvdread/ifo_read.c \
-                                        dvdread/md5.c \
-                                        dvdread/nav_print.c \
-                                        dvdread/nav_read.c \
+SRCS_COMMON-$(DVDREAD_INTERNAL)      += libdvdread/cmd_print.c \
+                                        libdvdread/dvd_input.c \
+                                        libdvdread/dvd_reader.c \
+                                        libdvdread/dvd_udf.c \
+                                        libdvdread/ifo_print.c \
+                                        libdvdread/ifo_read.c \
+                                        libdvdread/md5.c \
+                                        libdvdread/nav_print.c \
+                                        libdvdread/nav_read.c \
 
 SRCS_COMMON-$(FAAD)                  += libmpcodecs/ad_faad.c
 SRCS_COMMON-$(FAAD_INTERNAL)         += libfaad2/bits.c \
@@ -658,7 +658,6 @@ INSTALL_TARGETS-$(MENCODER) += install-mencoder install-mencoder-man
 INSTALL_TARGETS-$(MPLAYER)  += install-mplayer  install-mplayer-man
 
 DIRS =  . \
-        dvdread \
         gui \
         gui/mplayer \
         gui/mplayer/gtk \
@@ -682,6 +681,7 @@ DIRS =  . \
         ffmpeg/libavformat \
         ffmpeg/libavutil \
         libdvdcss \
+        libdvdread \
         libfaad2 \
         libmenu \
         libmpcodecs \
@@ -744,7 +744,7 @@ checkheaders: $(ALLHEADERS:.h=.ho)
 dep depend: $(DEPS)
 	for part in $(PARTS); do $(MAKE) -C $$part depend; done
 
-$(FFMPEGLIBS): $(FFMPEGFILES) libvo/fastmemcpy.h config.h
+$(FFMPEGLIBS): $(FFMPEGFILES) config.h
 	$(MAKE) -C $(@D)
 	touch $@
 
@@ -786,8 +786,8 @@ codec-cfg.d: codecs.conf.h
 mencoder.d mplayer.d vobsub.d gui/win32/gui.d libmpdemux/muxer_avi.d osdep/mplayer-rc.o stream/network.d stream/stream_cddb.d: version.h
 $(DEPS): help_mp.h
 
-dvdread/%.o dvdread/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_LIBDVDCSS_DVDREAD)
 libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\" $(CFLAGS_LIBDVDCSS)
+libdvdread/%.o libdvdread/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_LIBDVDCSS_DVDREAD)
 libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_FAAD_FIXED)
 
 loader/% loader/%: CFLAGS += -Iloader -fno-omit-frame-pointer $(CFLAGS_NO_OMIT_LEAF_FRAME_POINTER)
@@ -1059,13 +1059,10 @@ dhahelperwinclean:
 
 
 
-# Do not include dependencies when they are about to be removed anyway
-# or if SKIP_DEPS was set to "yes" on the command line.
+# Do not include dependencies when they are about to be removed anyway.
 ifneq ($(MAKECMDGOALS),distclean)
-ifneq ($(SKIP_DEPS),yes)
 -include $(DEPS)
 endif
-endif
 
 .PHONY: all doxygen *install* *tools drivers dhahelper*
 .PHONY: checkheaders *clean dep depend tests
diff --git a/TOOLS/netstream.c b/TOOLS/netstream.c
index c9ab7cdec7..0009f673f6 100644
--- a/TOOLS/netstream.c
+++ b/TOOLS/netstream.c
@@ -28,7 +28,7 @@
 
 #include "config.h"
 
-#ifndef HAVE_WINSOCK2
+#ifndef HAVE_WINSOCK2_H
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
diff --git a/command.c b/command.c
index 2bba96dca2..3a78cf68da 100644
--- a/command.c
+++ b/command.c
@@ -1365,6 +1365,7 @@ static int mp_property_sub(m_option_t *prop, int action, void *arg,
 
 	if ((mpctx->demuxer->type == DEMUXER_TYPE_MATROSKA
              || mpctx->demuxer->type == DEMUXER_TYPE_LAVF
+             || mpctx->demuxer->type == DEMUXER_TYPE_LAVF_PREFERRED
              || mpctx->demuxer->type == DEMUXER_TYPE_OGG)
              && d_sub && d_sub->sh && opts->sub_id >= 0) {
             const char* lang = ((sh_sub_t*)d_sub->sh)->lang;
diff --git a/configure b/configure
index 48c2a6d062..180e307255 100755
--- a/configure
+++ b/configure
@@ -239,7 +239,7 @@ Optional features:
   --disable-pvr          disable Video4Linux2 MPEG PVR [autodetect]
   --disable-rtc          disable RTC (/dev/rtc) on Linux [autodetect]
   --disable-network      disable networking [enable]
-  --enable-winsock2      enable winsock2 [autodetect]
+  --enable-winsock2_h    enable winsock2_h [autodetect]
   --enable-smb           enable Samba (SMB) input [autodetect]
   --enable-live          enable LIVE555 Streaming Media [autodetect]
   --enable-nemesi        enable Nemesi Streaming Media [autodetect]
@@ -275,8 +275,8 @@ Codecs:
   --enable-gif		    enable GIF support [autodetect]
   --enable-png		    enable PNG input/output support [autodetect]
   --enable-jpeg		    enable JPEG input/output support [autodetect]
-  --enable-libcdio	    enable external libcdio [autodetect]
-  --enable-liblzo	    enable external liblzo [autodetect]
+  --enable-libcdio	    enable libcdio support [autodetect]
+  --enable-liblzo	    enable liblzo support [autodetect]
   --disable-win32dll        disable Win32 DLL support [enabled]
   --disable-qtx             disable QuickTime codecs support [enabled]
   --disable-xanim           disable XAnim codecs support [enabled]
@@ -301,11 +301,11 @@ Codecs:
                                     in libavcodec [enabled]
   --disable-tremor-internal disable internal Tremor [enabled]
   --enable-tremor-low       enable lower accuracy internal Tremor [disabled]
-  --enable-tremor-external  enable external Tremor [autodetect]
+  --enable-tremor           enable external Tremor [autodetect]
   --disable-libvorbis       disable libvorbis support [autodetect]
   --disable-speex           disable Speex support [autodetect]
   --enable-theora           enable OggTheora libraries [autodetect]
-  --enable-faad-external    enable external FAAD2 (AAC) [autodetect]
+  --enable-faad             enable external FAAD2 (AAC) [autodetect]
   --disable-faad-internal   disable internal FAAD2 (AAC) [autodetect]
   --enable-faad-fixed       enable fixed-point mode in internal FAAD2 [disabled]
   --disable-faac            disable support for FAAC (AAC encoder) [autodetect]
@@ -431,6 +431,7 @@ Advanced options:
   --enable-altivec          enable AltiVec (PowerPC) [autodetect]
   --enable-armv5te          enable DSP extensions (ARM) [autodetect]
   --enable-armv6            enable ARMv6 (ARM) [autodetect]
+  --enable-armvfp           enable ARM VFP (ARM) [autodetect]
   --enable-iwmmxt           enable iWMMXt (ARM) [autodetect]
   --disable-fastmemcpy      disable 3DNow!/SSE/MMX optimized memcpy [enable]
   --enable-big-endian       force byte order to big-endian [autodetect]
@@ -479,6 +480,7 @@ _cmov=auto
 _fast_cmov=auto
 _armv5te=auto
 _armv6=auto
+_armvfp=auto
 _iwmmxt=auto
 _mtrr=auto
 _altivec=auto
@@ -565,9 +567,9 @@ _mp3lame=auto
 _mp3lame_lavc=auto
 _toolame=auto
 _twolame=auto
+_tremor=auto
 _tremor_internal=yes
 _tremor_low=no
-_tremor_external=auto
 _libvorbis=auto
 _speex=auto
 _theora=auto
@@ -575,8 +577,8 @@ _mp3lib=yes
 _liba52=yes
 _libdca=auto
 _libmpeg2=auto
+_faad=auto
 _faad_internal=auto
-_faad_external=auto
 _faad_fixed=no
 _faac=auto
 _faac_lavc=auto
@@ -619,7 +621,7 @@ _tv_dshow=auto
 _tv_teletext=auto
 _pvr=auto
 _network=yes
-_winsock2=auto
+_winsock2_h=auto
 _smb=auto
 _vidix=auto
 _vidix_pcidb=yes
@@ -926,12 +928,12 @@ for ac_option do
   --disable-libvorbis)	_libvorbis=no	;;
   --enable-speex)	_speex=yes	;;
   --disable-speex)	_speex=no	;;
+  --enable-tremor)	_tremor=yes	;;
+  --disable-tremor)	_tremor=no	;;
   --enable-tremor-internal)	_tremor_internal=yes	;;
   --disable-tremor-internal)	_tremor_internal=no	;;
   --enable-tremor-low)	_tremor_low=yes	;;
   --disable-tremor-low)	_tremor_low=no	;;
-  --enable-tremor-external)	_tremor_external=yes	;;
-  --disable-tremor-external)	_tremor_external=no	;;
   --enable-theora)	_theora=yes	;;
   --disable-theora)	_theora=no	;;
   --enable-mp3lib)	_mp3lib=yes	;;
@@ -944,10 +946,10 @@ for ac_option do
   --disable-libmpeg2)	_libmpeg2=no	;;
   --enable-musepack)	_musepack=yes	;;
   --disable-musepack)	_musepack=no	;;
+  --enable-faad)	_faad=yes	;;
+  --disable-faad)	_faad=no	;;
   --enable-faad-internal)	_faad_internal=yes	;;
   --disable-faad-internal)	_faad_internal=no	;;
-  --enable-faad-external)	_faad_external=yes	;;
-  --disable-faad-external)	_faad_external=no	;;
   --enable-faad-fixed)	_faad_fixed=yes	;;
   --disable-faad-fixed)	_faad_fixed=no	;;
   --enable-faac)	_faac=yes	;;
@@ -1020,8 +1022,8 @@ for ac_option do
   --disable-fastmemcpy)	_fastmemcpy=no	;;
   --enable-network)	_network=yes	;;
   --disable-network)	_network=no	;;
-  --enable-winsock2)	_winsock2=yes	;;
-  --disable-winsock2)	_winsock2=no	;;
+  --enable-winsock2_h)	_winsock2_h=yes	;;
+  --disable-winsock2_h)	_winsock2_h=no	;;
   --enable-smb)		_smb=yes	;;
   --disable-smb)	_smb=no	;;
   --enable-vidix)	_vidix=yes	;;
@@ -1221,6 +1223,8 @@ for ac_option do
   --disable-armv5te) _armv5te=no ;;
   --enable-armv6) _armv6=yes ;;
   --disable-armv6) _armv6=no ;;
+  --enable-armvfp) _armvfp=yes ;;
+  --disable-armvfp) _armvfp=no ;;
   --enable-iwmmxt) _iwmmxt=yes ;;
   --disable-iwmmxt) _iwmmxt=no ;;
   --enable-mmx)	_mmx=yes ;;
@@ -2502,6 +2506,16 @@ EOF
   fi
   echores "$_armv6"
 
+  echocheck "ARM VFP"
+  if test $_armvfp = "auto" ; then
+    cat > $TMPC << EOF
+int main(void) { __asm__ __volatile__ ("fadds s0, s0, s0"); return 0; }
+EOF
+    _armvfp=no
+    cc_check && _armvfp=yes
+  fi
+  echores "$_armvfp"
+
   echocheck "iWMMXt (Intel XScale SIMD instructions)"
   if test $_iwmmxt = "auto" ; then
     cat > $TMPC << EOF
@@ -2513,7 +2527,7 @@ EOF
   echores "$_iwmmxt"
 fi
 
-_cpuexts_all='ALTIVEC MMX MMX2 3DNOW 3DNOWEX SSE SSE2 SSSE3 FAST_CMOV CMOV ARMV5TE ARMV6 IWMMXT MLIB MMI SH4 VIS MVI'
+_cpuexts_all='ALTIVEC MMX MMX2 3DNOW 3DNOWEX SSE SSE2 SSSE3 FAST_CMOV CMOV ARMV5TE ARMV6 ARMVFP IWMMXT MLIB MMI SH4 VIS MVI'
 test "$_altivec"   = yes && _cpuexts="ALTIVEC $_cpuexts"
 test "$_mmx"       = yes && _cpuexts="MMX $_cpuexts"
 test "$_mmxext"    = yes && _cpuexts="MMX2 $_cpuexts"
@@ -2526,6 +2540,7 @@ test "$_cmov"      = yes && _cpuexts="CMOV $_cpuexts"
 test "$_fast_cmov" = yes && _cpuexts="FAST_CMOV $_cpuexts"
 test "$_armv5te"   = yes && _cpuexts="ARMV5TE $_cpuexts"
 test "$_armv6"     = yes && _cpuexts="ARMV6 $_cpuexts"
+test "$_armvfp"    = yes && _cpuexts="ARMVFP $_cpuexts"
 test "$_iwmmxt"    = yes && _cpuexts="IWMMXT $_cpuexts"
 test "$_vis"       = yes && _cpuexts="VIS $_cpuexts"
 test "$_mvi"       = yes && _cpuexts="MVI $_cpuexts"
@@ -2787,23 +2802,23 @@ _socklib=no
 for _ld_tmp in "" "-lsocket -lbind" "-lsocket -ldnet" "-lsocket -lnsl" "-lnsl" "-lsocket" ; do
   cc_check $_ld_tmp && _ld_sock="$_ld_tmp" && _socklib=yes && break
 done
-if test $_winsock2 = auto && ! cygwin ; then
-  _winsock2=no
+if test $_winsock2_h = auto && ! cygwin ; then
+  _winsock2_h=no
   cat > $TMPC << EOF
 #include <winsock2.h>
 int main(void) { (void) gethostbyname(0); return 0; }
 EOF
-  cc_check -lws2_32 && _ld_sock="-lws2_32" && _winsock2=yes
+  cc_check -lws2_32 && _ld_sock="-lws2_32" && _winsock2_h=yes
 fi
 test "$_ld_sock" && _res_comment="using $_ld_sock"
 echores "$_socklib"
 
 
-if test $_winsock2 = yes ; then
+if test $_winsock2_h = yes ; then
   _ld_sock="-lws2_32"
-  _def_winsock2='#define HAVE_WINSOCK2 1'
+  _def_winsock2_h='#define HAVE_WINSOCK2_H 1'
 else
-  _def_winsock2='#undef HAVE_WINSOCK2'
+  _def_winsock2_h='#undef HAVE_WINSOCK2_H'
 fi
 
 
@@ -2815,7 +2830,7 @@ cat > $TMPC << EOF
 #include <arpa/inet.h>
 int main(void) { (void) inet_pton(0, 0, 0); return 0; }
 EOF
-if test "$_winsock2" = yes ; then
+if test "$_winsock2_h" = yes ; then
     _res_comment="using winsock2 functions instead"
     echores "no"
 elif cc_check $_ld_sock ; then
@@ -2879,6 +2894,21 @@ fi
 echores "$_socklen_t"
 
 
+echocheck "closesocket()"
+_closesocket=no
+cat > $TMPC << EOF
+#include <winsock2.h>
+int main(void) { closesocket(~0); return 0; }
+EOF
+cc_check $_ld_sock && _closesocket=yes
+if test "$_closesocket" = yes ; then
+  _def_closesocket='#define HAVE_CLOSESOCKET 1'
+else
+  _def_closesocket='#undef HAVE_CLOSESOCKET'
+fi
+echores "$_closesocket"
+
+
 echocheck "network"
 # FIXME network check
 if test "$_network" = yes ; then
@@ -4529,7 +4559,7 @@ echocheck "DVB"
 if test "$_dvb" = auto ; then
   _dvb=no
 cat >$TMPC << EOF
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/ioctl.h>
 #include <stdio.h>
 #include <time.h>
@@ -4559,7 +4589,7 @@ if test "$_dvbhead" = auto ; then
   _dvbhead=no
 
 cat >$TMPC << EOF
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/ioctl.h>
 #include <stdio.h>
 #include <time.h>
@@ -5443,10 +5473,10 @@ elif test "$_dvdread" = auto ; then
   if test "$_dl" = yes; then
     cat > $TMPC << EOF
 #include <inttypes.h>
-#include <libdvdread/dvd_reader.h>
-#include <libdvdread/ifo_types.h>
-#include <libdvdread/ifo_read.h>
-#include <libdvdread/nav_read.h>
+#include <dvdread/dvd_reader.h>
+#include <dvdread/ifo_types.h>
+#include <dvdread/ifo_read.h>
+#include <dvdread/nav_read.h>
 int main(void) { return 0; }
 EOF
   fi
@@ -5905,13 +5935,13 @@ echores "$_toolame"
 echocheck "OggVorbis support"
 if test "$_tremor_internal" = yes; then
   _libvorbis=no
-elif test "$_tremor_external" = auto; then
-  _tremor_external=no
+elif test "$_tremor" = auto; then
+  _tremor=no
   cat > $TMPC << EOF
 #include <tremor/ivorbiscodec.h>
 int main(void) { vorbis_packet_blocksize(0,0); return 0; }
 EOF
-  cc_check -logg -lvorbisidec $_ld_lm && _tremor_external=yes && _libvorbis=no
+  cc_check -logg -lvorbisidec $_ld_lm && _tremor=yes && _libvorbis=no
 fi
 if test "$_libvorbis" = auto; then
   _libvorbis=no
@@ -5931,7 +5961,7 @@ if test "$_tremor_internal" = yes ; then
     cflags_tremor_low="-D_LOW_ACCURACY_"
     _res_comment="internal low accuracy Tremor"
   fi
-elif test "$_tremor_external" = yes ; then
+elif test "$_tremor" = yes ; then
   _vorbis=yes
   _def_vorbis='#define CONFIG_OGGVORBIS 1'
   _def_tremor='#define CONFIG_TREMOR 1'
@@ -6158,14 +6188,16 @@ if test "$_faad_internal" = auto ; then
         _res_comment="broken gcc"
         ;;
       *)
+        _faad=yes
         _faad_internal=yes
         ;;
     esac
   else
+    _faad=yes
     _faad_internal=yes
   fi
-elif test "$_faad_internal" = no && test "$_faad_external" = auto ; then
-  _faad_external=no
+fi
+if test "$_faad" = auto ; then
   cat > $TMPC << EOF
 #include <faad.h>
 #ifndef FAAD_MIN_STREAMSIZE
@@ -6174,12 +6206,13 @@ elif test "$_faad_internal" = no && test "$_faad_external" = auto ; then
 int main(void) { faacDecHandle testhand; faacDecFrameInfo testinfo;
     testhand = faacDecOpen(); faacDecInit(0, 0, 0, 0, 0); return 0; }
 EOF
-  cc_check -lfaad $_ld_lm && _faad_external=yes
+  cc_check -lfaad $_ld_lm && _faad=yes
 fi
 
+_def_faad='#undef CONFIG_FAAD'
+_def_faad_internal="#undef CONFIG_FAAD_INTERNAL"
 if test "$_faad_internal" = yes ; then
   _def_faad_internal="#define CONFIG_FAAD_INTERNAL 1"
-  _faad=yes
   _res_comment="internal floating-point"
   if test "$_faad_fixed" = yes ; then
     # The FIXED_POINT implementation of FAAD2 improves performance
@@ -6187,19 +6220,15 @@ if test "$_faad_internal" = yes ; then
     cflags_faad_fixed="-DFIXED_POINT"
     _res_comment="internal fixed-point"
   fi
-elif test "$_faad_external" = yes ; then
-  _faad=yes
+elif test "$_faad" = yes ; then
   _ld_extra="$_ld_extra -lfaad"
-else
-  _def_faad_internal="#undef CONFIG_FAAD_INTERNAL"
-  _faad=no
 fi
 
 if test "$_faad" = yes ; then
   _def_faad='#define CONFIG_FAAD 1'
   _codecmodules="faad2 $_codecmodules"
 else
-  _def_faad='#undef CONFIG_FAAD'
+  _faad=no
   _nocodecmodules="faad2 $_nocodecmodules"
 fi
 echores "$_faad"
@@ -8599,7 +8628,7 @@ $_def_ftp
 $_def_vstream
 
 /* enable winsock2 instead of Unix functions*/
-$_def_winsock2
+$_def_winsock2_h
 
 /* define this to use inet_aton() instead of inet_pton() */
 $_def_use_aton
@@ -8611,6 +8640,9 @@ $_def_socklen_t
 typedef int socklen_t;
 #endif
 
+/* closesocket() support */
+$_def_closesocket
+
 /* enables / disables cdparanoia support */
 $_def_cdparanoia
 $_def_cddb
diff --git a/cpudetect.c b/cpudetect.c
index 06287cd525..7faa4e7c77 100644
--- a/cpudetect.c
+++ b/cpudetect.c
@@ -51,7 +51,6 @@ CpuCaps gCpuCaps;
 
 static void check_os_katmai_support( void );
 
-#if 1
 // return TRUE if cpuid supported
 static int has_cpuid(void)
 {
@@ -81,7 +80,6 @@ static int has_cpuid(void)
 
 	return a != c;
 }
-#endif
 
 static void
 do_cpuid(unsigned int ax, unsigned int *p)
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 14b0f42d68..c8c06023e4 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -642,16 +642,16 @@ videocodec ffdivx
   status working
   fourcc MPG3,mpg3 div3
   fourcc MP43,mp43 div3   ; MSMPEG-4 v3   (fourcc mapping to div3)
-  fourcc DIV5,div5 div3   ; DivX 3.20 
+  fourcc DIV5,div5 div3   ; DivX 3.20
   fourcc DIV6,div6 div4   ;   -||-
   fourcc DIV3,div3,DIV4,div4
-  fourcc AP41 div3	  ; AngelPotion stuff
+  fourcc AP41 div3        ; AngelPotion stuff
   fourcc COL1,col1,COL0,col0 ; Cool codec (based on mpg4ds32.ax)
-  fourcc 3IVD,3ivd    ; divxdoctored files (3ivx.com) 
+  fourcc 3IVD,3ivd    ; divxdoctored files (3ivx.com)
   driver ffmpeg
   dll msmpeg4
   out YV12,I420,IYUV
-  
+
 videocodec ffmp42
   info "FFmpeg MSMPEG-4 v2"
   status working
@@ -693,7 +693,7 @@ videocodec ffwmv3
   driver ffmpeg
   dll wmv3
   out YV12,I420,IYUV
-  
+
 videocodec ffvc1
   info "FFmpeg WVC1"
   status buggy
@@ -728,7 +728,7 @@ videocodec ffodivx
   fourcc FMP4,fmp4
   fourcc DIVX,divx
   fourcc DIV1,div1 divx
-  fourcc MP4S,mp4s	; ISO MPEG-4 Video V1
+  fourcc MP4S,mp4s ; ISO MPEG-4 Video V1
   fourcc M4S2,m4s2
   fourcc xvid,XVID,XviD,XVIX
   fourcc DX50,dx50,BLZ0 DX50
@@ -736,7 +736,7 @@ videocodec ffodivx
   format 0x4
   fourcc UMP4
   fourcc RMP4
-  fourcc 3IV2,3iv2  ; 3ivx Delta 4   
+  fourcc 3IV2,3iv2  ; 3ivx Delta 4
   fourcc DXGM
   fourcc SEDG ; diskless camcorder Samsung Miniket VP-M110
   fourcc SMP4,smp4 ; Samsung SMP4 video codec
@@ -807,9 +807,9 @@ videocodec divx4vfw
   comment "sig11 with -framedrop"
   fourcc DIVX,divx        ; opendivx / divx4
   fourcc DIV1,div1 divx
-;  fourcc MP4S,mp4s	  ; ISO MPEG-4 Video V1
+;  fourcc MP4S,mp4s       ; ISO MPEG-4 Video V1
   fourcc MP43,mp43,DIV3,div3,DIV4,div4 DIV3  ; for DivX4Linux only!
-  fourcc AP41 DIV3	  ; AngelPotion stuff
+  fourcc AP41 DIV3        ; AngelPotion stuff
   format 0x4
   driver vfw
   dll "divx.dll"
@@ -827,7 +827,7 @@ videocodec divxds
   fourcc DIV5,div5 div3
   fourcc DIV6,div6 div4
   fourcc DIV3,div3,DIV4,div4
-  fourcc AP41 div3	  ; AngelPotion stuff
+  fourcc AP41 div3        ; AngelPotion stuff
   driver dshow
   dll "divx_c32.ax"
   guid 0x82CCd3E0, 0xF71A, 0x11D0, 0x9f, 0xe5, 0x00, 0x60, 0x97, 0x78, 0xaa, 0xaa
@@ -838,15 +838,15 @@ videocodec divx
   info "DivX ;-) (MSMPEG-4 v3)"
   status working
   fourcc MP43,mp43 div3   ; MSMPEG-4 v3   (fourcc mapping to div3)
-  fourcc DIV5,div5 div3   ; DivX 3.20 
+  fourcc DIV5,div5 div3   ; DivX 3.20
   fourcc DIV6,div6 div4   ;   -||-
   fourcc DIV3,div3,DIV4,div4
-  fourcc AP41 div3	  ; AngelPotion stuff
+  fourcc AP41 div3        ; AngelPotion stuff
   driver vfw
   dll "divxc32.dll"
   out YUY2 yuvhack
   out BGR32,BGR24,BGR15
-  
+
 ; hmm. we should check, maybe these are/will be playable with libavcodec:
 
 videocodec mpeg4ds
@@ -854,7 +854,7 @@ videocodec mpeg4ds
   status working
   comment "with postprocessing"
   fourcc DIV2,div2 mp42
-  fourcc MP4S,mp4s	; ISO MPEG-4 Video V1
+  fourcc MP4S,mp4s      ; ISO MPEG-4 Video V1
   fourcc MPG4,mpg4
   fourcc MP42,mp42
   driver dshow
@@ -1106,8 +1106,8 @@ videocodec pegasusm
   status crashing
   fourcc MJPG
   driver vfw
-;  dll "pvmjpg20.dll"	; v2.0
-  dll "pvmjpg21.dll"	; v2.1
+;  dll "pvmjpg20.dll"   ; v2.0
+  dll "pvmjpg21.dll"    ; v2.1
   out BGR24 flip
 
 videocodec pegasusl
@@ -1466,7 +1466,7 @@ videocodec ffrv20
   driver ffmpeg
   dll rv20
   out YV12,I420,IYUV
-  
+
 videocodec rv20
   info "Linux RealPlayer 8 RV20 decoder"
   status working
@@ -2522,7 +2522,7 @@ videocodec rawy800
   info "RAW Y8/Y800"
   status working
   driver raw
-  format 0x0 
+  format 0x0
   format 0x20203859 ; "Y8  "
   fourcc y800,Y800
   out Y800,Y8
@@ -2981,6 +2981,18 @@ audiocodec faad
   driver faad
   dll libfaad2
 
+audiocodec ffaac
+  info "FFmpeg AAC (MPEG-2/MPEG-4 Audio) decoder"
+  status working
+  fourcc mp4a,MP4A
+  fourcc "VLB " ; Used in NSV, not really working
+  fourcc "AAC " ; Used in NSV
+  fourcc "AACP" ; Used in NSV for AACPlus
+  format 0xff
+  format 0x706D
+  driver ffmpeg
+  dll aac
+
 audiocodec ffflac
   info "FFmpeg FLAC audio decoder"
   status working
@@ -3197,7 +3209,7 @@ audiocodec imaadpcmacm
   format 0x11
   driver acm
   dll "imaadp32.acm"
-  
+
 audiocodec msgsm
   info "MS GSM"
   status working
@@ -3259,6 +3271,13 @@ audiocodec ffac3
   driver ffmpeg
   dll ac3
 
+audiocodec ffeac3
+  info "FFmpeg E-AC-3"
+  status working
+  fourcc EAC3
+  driver ffmpeg
+  dll eac3
+
 audiocodec dts
   info "DTS-libdca"
   status working
@@ -3439,8 +3458,8 @@ audiocodec g72x
   info "G.711/G.721/G.723"
   status crashing
   comment "does not work yet - just noise :("
-  format 0x111	    ; vivo g.723
-  format 0x112	    ; vivo siren
+  format 0x111      ; vivo g.723
+  format 0x112      ; vivo siren
   driver g72x
   dll "g72x.c"
 
diff --git a/gui/mplayer/gtk/mb.c b/gui/mplayer/gtk/mb.c
index 0bb0188e62..4d2a3fa676 100644
--- a/gui/mplayer/gtk/mb.c
+++ b/gui/mplayer/gtk/mb.c
@@ -20,8 +20,8 @@
 #include "gui/app.h"
 #include "help_mp.h"
 
-#include "../pixmaps/error.xpm"
-#include "../pixmaps/warning.xpm"
+#include "gui/mplayer/pixmaps/error.xpm"
+#include "gui/mplayer/pixmaps/warning.xpm"
 
 #include "gui/mplayer/widgets.h"
 #include "mb.h"
diff --git a/gui/mplayer/gtk/menu.c b/gui/mplayer/gtk/menu.c
index beac3325c1..a13e85560a 100644
--- a/gui/mplayer/gtk/menu.c
+++ b/gui/mplayer/gtk/menu.c
@@ -34,47 +34,47 @@
 #include "libmpdemux/demuxer.h"
 #include "libmpdemux/stheader.h"
 
-#include "../pixmaps/ab.xpm"
-#include "../pixmaps/half.xpm"
-#include "../pixmaps/normal.xpm"
-#include "../pixmaps/double.xpm"
-#include "../pixmaps/fs.xpm"
-#include "../pixmaps/exit.xpm"
-#include "../pixmaps/prefs.xpm"
-#include "../pixmaps/eq.xpm"
-#include "../pixmaps/pl.xpm"
-#include "../pixmaps/skin.xpm"
-#include "../pixmaps/sound.xpm"
-#include "../pixmaps/open.xpm"
-#include "../pixmaps/play.xpm"
-#include "../pixmaps/stop2.xpm"
-#include "../pixmaps/pause.xpm"
-#include "../pixmaps/prev.xpm"
-#include "../pixmaps/next.xpm"
-#include "../pixmaps/aspect.xpm"
-#include "../pixmaps/a11.xpm"
-#include "../pixmaps/a169.xpm"
-#include "../pixmaps/a235.xpm"
-#include "../pixmaps/a43.xpm"
-#include "../pixmaps/file2.xpm"
-#include "../pixmaps/url.xpm"
-#include "../pixmaps/sub.xpm"
-#include "../pixmaps/delsub.xpm"
-#include "../pixmaps/empty.xpm"
-#include "../pixmaps/loadeaf.xpm"
-#include "../pixmaps/title.xpm"
+#include "gui/mplayer/pixmaps/ab.xpm"
+#include "gui/mplayer/pixmaps/half.xpm"
+#include "gui/mplayer/pixmaps/normal.xpm"
+#include "gui/mplayer/pixmaps/double.xpm"
+#include "gui/mplayer/pixmaps/fs.xpm"
+#include "gui/mplayer/pixmaps/exit.xpm"
+#include "gui/mplayer/pixmaps/prefs.xpm"
+#include "gui/mplayer/pixmaps/eq.xpm"
+#include "gui/mplayer/pixmaps/pl.xpm"
+#include "gui/mplayer/pixmaps/skin.xpm"
+#include "gui/mplayer/pixmaps/sound.xpm"
+#include "gui/mplayer/pixmaps/open.xpm"
+#include "gui/mplayer/pixmaps/play.xpm"
+#include "gui/mplayer/pixmaps/stop2.xpm"
+#include "gui/mplayer/pixmaps/pause.xpm"
+#include "gui/mplayer/pixmaps/prev.xpm"
+#include "gui/mplayer/pixmaps/next.xpm"
+#include "gui/mplayer/pixmaps/aspect.xpm"
+#include "gui/mplayer/pixmaps/a11.xpm"
+#include "gui/mplayer/pixmaps/a169.xpm"
+#include "gui/mplayer/pixmaps/a235.xpm"
+#include "gui/mplayer/pixmaps/a43.xpm"
+#include "gui/mplayer/pixmaps/file2.xpm"
+#include "gui/mplayer/pixmaps/url.xpm"
+#include "gui/mplayer/pixmaps/sub.xpm"
+#include "gui/mplayer/pixmaps/delsub.xpm"
+#include "gui/mplayer/pixmaps/empty.xpm"
+#include "gui/mplayer/pixmaps/loadeaf.xpm"
+#include "gui/mplayer/pixmaps/title.xpm"
 #ifdef CONFIG_DVDREAD
-#include "../pixmaps/dvd.xpm"
-#include "../pixmaps/playdvd.xpm"
-#include "../pixmaps/chapter.xpm"
-#include "../pixmaps/dolby.xpm"
-#include "../pixmaps/tongue.xpm"
-#include "../pixmaps/tonguebla.xpm"
-#include "../pixmaps/empty1px.xpm"
+#include "gui/mplayer/pixmaps/dvd.xpm"
+#include "gui/mplayer/pixmaps/playdvd.xpm"
+#include "gui/mplayer/pixmaps/chapter.xpm"
+#include "gui/mplayer/pixmaps/dolby.xpm"
+#include "gui/mplayer/pixmaps/tongue.xpm"
+#include "gui/mplayer/pixmaps/tonguebla.xpm"
+#include "gui/mplayer/pixmaps/empty1px.xpm"
 #endif
 #ifdef CONFIG_VCD
-#include "../pixmaps/vcd.xpm"
-#include "../pixmaps/playvcd.xpm"
+#include "gui/mplayer/pixmaps/vcd.xpm"
+#include "gui/mplayer/pixmaps/playvcd.xpm"
 #endif
 
 void ActivateMenuItem( int Item )
diff --git a/gui/win32/playlist.c b/gui/win32/playlist.c
index 5c088119d2..344e99636e 100644
--- a/gui/win32/playlist.c
+++ b/gui/win32/playlist.c
@@ -23,6 +23,7 @@
 
 #include <windows.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include "mp_msg.h"
 #include "playlist.h"
 
diff --git a/help/help_mp-it.h b/help/help_mp-it.h
index af006a3b69..dfecd6edeb 100644
--- a/help/help_mp-it.h
+++ b/help/help_mp-it.h
@@ -2,7 +2,8 @@
 // Updated by: Roberto Togni <see AUTHORS for email address>
 // Updated by: PaulTT <see AUTHORS for email address>
 
-// Updated to help_mp-en.h r26795
+// Updated to help_mp-en.h r27071
+
 
 // ========================= MPlayer help ===========================
 
@@ -18,8 +19,8 @@ static char help_text[]=
 #endif
 #ifdef CONFIG_DVDREAD
 " dvd://<titleno>  legge titolo/traccia DVD dal dispositivo anziché da file\n"
-" -alang/-slang    sceglie lingua audio/sottotitoli DVD (cod naz. 2 caratteri)\n"
 #endif
+" -alang/-slang    sceglie lingua audio/sottotitoli DVD (cod naz. 2 caratteri)\n"
 " -ss <posizione>  cerca una determinata posizione (in secondi o in hh:mm:ss) \n"
 " -nosound         non riproduce l'audio\n"
 " -fs              opzioni schermo intero (o -vm, -zoom, vedi pagina man)\n"
@@ -54,7 +55,6 @@ static char help_text[]=
 // ========================= MPlayer messages ===========================
 
 // mplayer.c:
-
 #define MSGTR_Exiting "\nIn uscita...\n"
 #define MSGTR_ExitingHow "\nIn uscita... (%s)\n"
 #define MSGTR_Exit_quit "Uscita"
@@ -202,7 +202,6 @@ static char help_text[]=
 #define MSGTR_MPEndposNoSizeBased "L'opzione -endpos in MPlayer non supporta ancora unità di mis. di dimensione.\n"
 
 // mplayer.c OSD
-
 #define MSGTR_OSDenabled "abilitat"
 #define MSGTR_OSDdisabled "disabilitat"
 #define MSGTR_OSDAudio "Audio: %s"
@@ -224,7 +223,7 @@ static char help_text[]=
 #define MSGTR_Top "in alto"
 #define MSGTR_SubSourceDemux "incorporati"
 
-// osd bar names
+// OSD bar names
 #define MSGTR_Volume "Volume"
 #define MSGTR_Panscan "Panscan"
 #define MSGTR_Gamma "Gamma"
@@ -253,7 +252,6 @@ static char help_text[]=
 #define MSGTR_SubForcedOnlyStatus "Solo sottotitoli forzati: %si"
 
 // mencoder.c:
-
 #define MSGTR_UsingPass3ControlFile "Sto usando il file di controllo passo3: %s\n"
 #define MSGTR_MissingFilename "\nNome file mancante.\n\n"
 #define MSGTR_CannotOpenFile_Device "Impossibile aprire il file/dispositivo.\n"
@@ -420,7 +418,6 @@ static char help_text[]=
 #define MSGTR_CantCopyAudioFormat "Il formato audio 0x%x è incompatibile con '-oac copy', prova invece '-oac pcm' o usa '-fafmttag' per forzare.\n"
 
 // cfg-mencoder.h:
-
 #define MSGTR_MEncoderMP3LameHelp "\n\n"\
 " vbr=<0-4>     metodo bitrate variabile\n"\
 "                0: cbr (bitrate costante)\n"\
@@ -715,9 +712,8 @@ static char help_text[]=
 #define MSGTR_NoVolume "[Mixer] Regolazione del volume non disponibile.\n"
 #define MSGTR_NoBalance "[Mixer] Controllo del bilanciamento non disponibile.\n"
 
-// ====================== GUI messages/buttons ========================
 
-#ifdef CONFIG_GUI
+// ====================== GUI messages/buttons ========================
 
 // --- labels ---
 #define MSGTR_About "Informazioni su"
@@ -783,7 +779,7 @@ static char help_text[]=
 #define MSGTR_SKIN_SKINCFG_SkinCfgReadError "Errore nella lettura del file di configurazione della skin (%s).\n"
 #define MSGTR_SKIN_LABEL "Skins:"
 
-// --- gtk menus
+// --- GTK menus
 #define MSGTR_MENU_AboutMPlayer "Informazioni su MPlayer"
 #define MSGTR_MENU_Open "Apri..."
 #define MSGTR_MENU_PlayFile "Riproduci il file..."
@@ -974,28 +970,23 @@ static char help_text[]=
 #define MSGTR_MSGBOX_LABEL_Warning "Avvertimento!"
 
 // bitmap.c
-
 #define MSGTR_NotEnoughMemoryC32To1 "[c32to1] non c'è abbastanza memoria per l'immagine\n"
 #define MSGTR_NotEnoughMemoryC1To32 "[c1to32] non c'è abbastanza memoria per l'immagine\n"
 
 // cfg.c
-
 #define MSGTR_ConfigFileReadError "[cfg] errore di lettura file di configurazione...\n"
 #define MSGTR_UnableToSaveOption "[cfg] non riesco a salvare l'opzione '%s'.\n"
 
 // interface.c
-
 #define MSGTR_DeletingSubtitles "[GUI] Elimino sottotitoli.\n"
 #define MSGTR_LoadingSubtitles "[GUI] Carico sottotitoli: %s\n"
 #define MSGTR_AddingVideoFilter "[GUI] Aggiungo filtro video: %s\n"
 #define MSGTR_RemovingVideoFilter "[GUI] Rimuovo filtro video: %s\n"
 
 // mw.c
-
 #define MSGTR_NotAFile "Questo non pare essere un file: %s !\n"
 
 // ws.c
-
 #define MSGTR_WS_CouldNotOpenDisplay "[ws] Non posso aprire il display.\n"
 #define MSGTR_WS_RemoteDisplay "[ws] Display remoto, disabilito XMITSHM.\n"
 #define MSGTR_WS_NoXshm "[ws] Spiacente, il tuo sistema non supporta l'estensione 'X shared memory'.\n"
@@ -1008,13 +999,11 @@ static char help_text[]=
 #define MSGTR_WS_DpmsNotEnabled "Non posso abilitare DPMS.\n"
 
 // wsxdnd.c
-
 #define MSGTR_WS_NotAFile "Questo non sembra essere un file...\n"
 #define MSGTR_WS_DDNothing "D&D: Nessun valore di ritorno!\n"
 
-#endif
 
-// ======================= VO Video Output drivers ========================
+// ======================= video output drivers ========================
 
 #define MSGTR_VOincompCodec "Il dispositivo di uscita video_out scelto è incompatibile con questo codec.\n"\
                 "Prova aggiungendo il filtro scale alla sequenza dei filtri,\n"\
@@ -1034,7 +1023,6 @@ static char help_text[]=
 #define MSGTR_VO_UnknownSuboptions "Sottoopzione/i sconosciuta/e"
 
 // vo_aa.c
-
 #define MSGTR_VO_AA_HelpHeader "\n\nEcco le sottoopzioni per l'aalib vo_aa:\n"
 #define MSGTR_VO_AA_AdditionalOptions "Le opzioni addizionali di vo_aa:\n" \
 "  help        mostra questo messaggio\n" \
@@ -1094,14 +1082,13 @@ static char help_text[]=
 // vo_xv.c
 #define MSGTR_VO_XV_ImagedimTooHigh "Dimensioni dell'immagine origine troppo grandi: %ux%u (il massimo è %ux%u)\n"
 
-// Old vo drivers that have been replaced
+// old vo drivers that have been replaced
 
 #define MSGTR_VO_PGM_HasBeenReplaced "Il driver di uscita video pgm è stato sostituito con -vo pnm:pgmyuv.\n"
 #define MSGTR_VO_MD5_HasBeenReplaced "Il driver di uscita video md5 è stato sostituito con -vo md5sum.\n"
 
-// ======================= AO Audio Output drivers ========================
 
-// libao2 
+// ======================= audio output drivers ========================
 
 // audio_out.c
 #define MSGTR_AO_ALSA9_1x_Removed "audio_out: i moduli alsa9/alsa1x sono stati rimossi, ora usa -ao alsa.\n"
@@ -1256,12 +1243,12 @@ static char help_text[]=
 
 #define MSGTR_AO_PLUGIN_InvalidPlugin "[AO PLUGIN] plugin non valido: %s\n"
 
-// ======================= AF Audio Filters ================================
+
+// ======================= audio filters ================================
 
 // libaf 
 
 // af_ladspa.c
-
 #define MSGTR_AF_LADSPA_AvailableLabels "etichette disponibili in"
 #define MSGTR_AF_LADSPA_WarnNoInputs "WARNING! Questo plugin LADSPA non ha entrate audio.\n  Il segnale audio in entrata verrà perso."
 #define MSGTR_AF_LADSPA_ErrMultiChannel "I plugin multi-canale (>2) non sono supportati (finora).\n  Usare solo i plugin mono e stereo."
@@ -1278,13 +1265,12 @@ static char help_text[]=
 #define MSGTR_AF_LADSPA_ErrControlAbove "%s: Il controllo di input #%d è sopra al limite superiore di %0.4f.\n"
 
 // format.c
-
 #define MSGTR_AF_FORMAT_UnknownFormat "formato sconosciuto "
 
+
 // ========================== INPUT =========================================
 
 // joystick.c
-
 #define MSGTR_INPUT_JOYSTICK_Opening "Apertura dispositivo joystick %s\n"
 #define MSGTR_INPUT_JOYSTICK_CantOpen "Non posso aprire il dispositivo joystick %s: %s\n"
 #define MSGTR_INPUT_JOYSTICK_ErrReading "Errore in lettura dispositivo joystick: %s\n"
@@ -1325,20 +1311,18 @@ static char help_text[]=
 #define MSGTR_INPUT_INPUT_ErrCantOpenFile "Impossibile aprire %s: %s\n"
 #define MSGTR_INPUT_INPUT_ErrCantInitAppleRemote "Impossibile inizializzare l'Apple Remote.\n"
 
+
 // ========================== LIBMPDEMUX ===================================
 
 // url.c
-
 #define MSGTR_MPDEMUX_URL_StringAlreadyEscaped "La stringa sembra essere già filtrata in url_escape %c%c1%c2\n"
 
 // ai_alsa1x.c
-
 #define MSGTR_MPDEMUX_AIALSA1X_CannotSetSamplerate "Non posso impostare il samplerate.\n"
 #define MSGTR_MPDEMUX_AIALSA1X_CannotSetBufferTime "Non posso impostare il tempo del buffer.\n"
 #define MSGTR_MPDEMUX_AIALSA1X_CannotSetPeriodTime "Non posso impostare il tempo del periodo.\n"
 
 // ai_alsa1x.c / ai_alsa.c
-
 #define MSGTR_MPDEMUX_AIALSA_PcmBrokenConfig "Configurazione PCM rovinata: nessuna configurazione disponibile.\n"
 #define MSGTR_MPDEMUX_AIALSA_UnavailableAccessType "Tipo di accesso non disponibile.\n"
 #define MSGTR_MPDEMUX_AIALSA_UnavailableSampleFmt "Formato sample non disponibile.\n"
@@ -1354,7 +1338,6 @@ static char help_text[]=
 #define MSGTR_MPDEMUX_AIALSA_AlsaReadWriteError "ALSA errore di lettura/scrittura"
 
 // ai_oss.c
-
 #define MSGTR_MPDEMUX_AIOSS_Unable2SetChanCount "Impossibile impostare il numero di canali: %d\n"
 #define MSGTR_MPDEMUX_AIOSS_Unable2SetStereo "Impossibile impostare lo stereo: %d\n"
 #define MSGTR_MPDEMUX_AIOSS_Unable2Open "Non posso aprire '%s': %s\n"
@@ -1367,7 +1350,6 @@ static char help_text[]=
 #define MSGTR_MPDEMUX_AIOSS_AudioBlockSize2Low "La dimensione del blocco audio è troppo bassa, la imposto a %d!\n"
 
 // asfheader.c
-
 #define MSGTR_MPDEMUX_ASFHDR_HeaderSizeOver1MB "FATALE: la dimensione dell'intestazione è più grande di 1 MB (%d)!\nPerfavore contatta gli autori di MPlayer e invia/rendi disponibile questo file.\n"
 #define MSGTR_MPDEMUX_ASFHDR_HeaderMallocFailed "Non ho potuto allocare %d byte per l'intestazione.\n"
 #define MSGTR_MPDEMUX_ASFHDR_EOFWhileReadingHeader "EOF durante la lettura dell'intestazione ASF, file danneggiato/incompleto?\n"
@@ -1379,7 +1361,6 @@ static char help_text[]=
 #define MSGTR_MPDEMUX_ASFHDR_DRMProtected "Questo file è stato oscurato con protezione DRM, non potrà esser riprodotto in MPlayer!\n"
 
 // asf_mmst_streaming.c
-
 #define MSGTR_MPDEMUX_MMST_WriteError "Errore di scrittura\n"
 #define MSGTR_MPDEMUX_MMST_EOFAlert "\nAttenzione! EOF\n"
 #define MSGTR_MPDEMUX_MMST_PreHeaderReadFailed "lettura pre-intestazione fallita.\n"
@@ -1402,7 +1383,6 @@ static char help_text[]=
 #define MSGTR_MPDEMUX_MMST_Connected "connesso\n"
 
 // asf_streaming.c
-
 #define MSGTR_MPDEMUX_ASF_StreamChunkSize2Small "Ahhhh, la dimensione stream_chunk è troppo piccola: %d\n"
 #define MSGTR_MPDEMUX_ASF_SizeConfirmMismatch "disallineamento size_confirm!: %d %d\n"
 #define MSGTR_MPDEMUX_ASF_WarnDropHeader "Attenzione: scarto intestazione ????\n"
@@ -1433,14 +1413,12 @@ static char help_text[]=
 #define MSGTR_MPDEMUX_ASF_StreamingFailed "fallimento, esco.\n"
 
 // audio_in.c
-
 #define MSGTR_MPDEMUX_AUDIOIN_ErrReadingAudio "\nerrore leggendo l'audio: %s\n"
 #define MSGTR_MPDEMUX_AUDIOIN_XRUNSomeFramesMayBeLeftOut "Recupero da un cross-run, alcuni fotogrammi possono essere stati persi!\n"
 #define MSGTR_MPDEMUX_AUDIOIN_ErrFatalCannotRecover "Errore fatale, non posso recuperare!\n"
 #define MSGTR_MPDEMUX_AUDIOIN_NotEnoughSamples "\nnon ci sono abbastanza parti audio!\n"
 
 // aviheader.c
-
 #define MSGTR_MPDEMUX_AVIHDR_EmptyList "** lista vuota?!\n"
 #define MSGTR_MPDEMUX_AVIHDR_FoundMovieAt "Trovato filmato a 0x%X - 0x%X\n"
 #define MSGTR_MPDEMUX_AVIHDR_FoundBitmapInfoHeader "trovato 'bih', %u byte di %d\n"
@@ -1466,18 +1444,15 @@ static char help_text[]=
 #define MSGTR_MPDEMUX_AVIHDR_IdxFileSaved "Salvato file indice: %s\n"
 
 // cache2.c
-
 #define MSGTR_MPDEMUX_CACHE2_NonCacheableStream "\rNon posso riempire la cache per questo flusso.\n"
 #define MSGTR_MPDEMUX_CACHE2_ReadFileposDiffers "!!! read_filepos è differente!!! Riporta questo errore...\n"
 
 // cdda.c
-
 #define MSGTR_MPDEMUX_CDDA_CantOpenCDDADevice "Impossibile aprire il dispositivo CDDA.\n"
 #define MSGTR_MPDEMUX_CDDA_CantOpenDisc "Impossibile aprire il disco.\n"
 #define MSGTR_MPDEMUX_CDDA_AudioCDFoundWithNTracks "Trovato CD audio con %ld tracce.\n"
 
 // cddb.c
-
 #define MSGTR_MPDEMUX_CDDB_FailedToReadTOC "Imposibile leggere la TOC.\n"
 #define MSGTR_MPDEMUX_CDDB_FailedToOpenDevice "Apertura del dispositivo %s fallita.\n"
 #define MSGTR_MPDEMUX_CDDB_NotAValidURL "URL non valido\n"
@@ -1501,7 +1476,6 @@ static char help_text[]=
 #define MSGTR_MPDEMUX_CDDB_NoCDInDrive "Nessun CD nel lettore.\n"
 
 // cue_read.c
-
 #define MSGTR_MPDEMUX_CUEREAD_UnexpectedCuefileLine "[bincue] Linea del file cue inattesa: %s\n"
 #define MSGTR_MPDEMUX_CUEREAD_BinFilenameTested "[bincue] Verificato nome del file bin: %s\n"
 #define MSGTR_MPDEMUX_CUEREAD_CannotFindBinFile "[bincue] Impossibile trovare il file bin - mi arrendo.\n"
@@ -1516,7 +1490,6 @@ static char help_text[]=
 #define MSGTR_MPDEMUX_CUEREAD_CueStreamInfo_FilenameTrackTracksavail "CUE stream_open, nomefile=%s, traccia=%d, tracce disponibili: %d -> %d\n"
 
 // network.c
-
 #define MSGTR_MPDEMUX_NW_UnknownAF "Famiglia d'indirizzi %d sconosciuta\n"
 #define MSGTR_MPDEMUX_NW_ResolvingHostForAF "Risolvo %s per %s...\n"
 #define MSGTR_MPDEMUX_NW_CantResolv "Impossibile risolvere il nome per %s: %s\n"
@@ -1539,11 +1512,9 @@ static char help_text[]=
 #define MSGTR_MPDEMUX_NW_CacheSizeSetTo "Dimensione cache impostata a %d KByte\n"
 
 // demux_audio.c
-
 #define MSGTR_MPDEMUX_AUDIO_UnknownFormat "Demuxer audio: formato %d sconosciuto.\n"
 
 // demux_demuxers.c
-
 #define MSGTR_MPDEMUX_DEMUXERS_FillBufferError "Errore in fill_buffer: cattivo demuxer: non vd, ad o sd.\n"
 
 // demux_mkv.c
@@ -1568,19 +1539,17 @@ static char help_text[]=
 #define MSGTR_MPDEMUX_MKV_TooManySublinesSkippingAfterFirst "\n[mkv] Attenzione: troppe sottolinee da visualizzare, le salto dopo le prime %i.\n"
 
 // demux_nuv.c
-
 #define MSGTR_MPDEMUX_NUV_NoVideoBlocksInFile "Nessun blocco video nel file.\n"
 
 // demux_xmms.c
-
 #define MSGTR_MPDEMUX_XMMS_FoundPlugin "Trovato plugin: %s (%s).\n"
 #define MSGTR_MPDEMUX_XMMS_ClosingPlugin "Chiudo plugin: %s.\n"
 #define MSGTR_MPDEMUX_XMMS_WaitForStart "Attendo che il plugin XMMS inizi la riproduzione di '%s'...\n"
 
-// ========================== LIBMPMENU ===================================
 
-// common
+// ========================== LIBMENU ===================================
 
+// common
 #define MSGTR_LIBMENU_NoEntryFoundInTheMenuDefinition "[MENU] Nessuna voce trovata nella definizione del menu.\n"
 
 // libmenu/menu.c
@@ -1635,6 +1604,7 @@ static char help_text[]=
 #define MSGTR_LIBMENU_UnknownMenuCommand "[MENU] Comando sconosciuto: '%s'.\n"
 #define MSGTR_LIBMENU_FailedToOpenMenu "[MENU] Impossibile aprire il menu: '%s'.\n"
 
+
 // ========================== LIBMPCODECS ===================================
 
 // libmpcodecs/ad_libdv.c
@@ -1690,10 +1660,10 @@ static char help_text[]=
 // libmpcodecs/vf_test.c, vf_yuy2.c, vf_yvu9.c
 #define MSGTR_MPCODECS_WarnNextFilterDoesntSupport "%s non supportato dal filtro/vo successivo :(\n"
 
-// ================================== LIBMPVO ====================================
 
-// mga_common.c
+// ================================== LIBVO ====================================
 
+// mga_common.c
 #define MSGTR_LIBVO_MGA_ErrorInConfigIoctl "[MGA] errore in ioctl di mga_vid_config (versione sbagliata di mga_vid.o?)"
 #define MSGTR_LIBVO_MGA_CouldNotGetLumaValuesFromTheKernelModule "[MGA] Impossibile ottenere i valori di luminanza dal modulo del kernel!\n"
 #define MSGTR_LIBVO_MGA_CouldNotSetLumaValuesFromTheKernelModule "[MGA] Impossibile impostare i valori di luminanza dal modulo del kernel!\n"
@@ -1702,16 +1672,15 @@ static char help_text[]=
 #define MSGTR_LIBVO_MGA_IncompatibleDriverVersion "[MGA] La versione del tuo driver mga_vid è incompatibile con questo MPlayer!\n"
 #define MSGTR_LIBVO_MGA_CouldntOpen "[MGA] Impossibile aprire: %s\n"
 #define MGSTR_LIBVO_MGA_ResolutionTooHigh "[MGA] La risoluzione del sorgente ha almeno una delle due dimensioni maggiore di 1023x1023. Per favore ridimensiona via software o usa -lavdopts lowres=1\n"
+#define MGSTR_LIBVO_MGA_mgavidVersionMismatch "[MGA] incongruenza tra le versioni del driver mga_vid del kernel (%u) e di MPlayer (%u)\n"
 
 // libvo/vesa_lvo.c
-
 #define MSGTR_LIBVO_VESA_ThisBranchIsNoLongerSupported "[VESA_LVO] Questo branch non è più supportato.\n[VESA_LVO] Per favore usa al suo posto -vo vesa:vidix.\n"
 #define MSGTR_LIBVO_VESA_CouldntOpen "[VESA_LVO] Impossibile aprire: '%s'\n"
 #define MSGTR_LIBVO_VESA_InvalidOutputFormat "[VESA_LVI] formato di uscita non valido: %s(%0X)\n"
 #define MSGTR_LIBVO_VESA_IncompatibleDriverVersion "[VESA_LVO] La versione del tuo driver fb_vid è incompatibile con questo MPlayer!\n"
 
 // libvo/vo_3dfx.c
-
 #define MSGTR_LIBVO_3DFX_Only16BppSupported "[VO_3DFX] Supportati solo 16bpp!"
 #define MSGTR_LIBVO_3DFX_VisualIdIs "[VO_3DFX] L'ID visuale è %lx.\n"
 #define MSGTR_LIBVO_3DFX_UnableToOpenDevice "[VO_3DFX] Impossibile aprire /dev/3dfx.\n"
@@ -1725,7 +1694,6 @@ static char help_text[]=
 #define MSGTR_LIBVO_ASPECT_NoNewSizeFoundThatFitsIntoRes "[ASPECT] Errore: Non ho trovato una nuova dimensione inferiore alla risoluz.!\n"
 
 // libvo/vo_dxr3.c
-
 #define MSGTR_LIBVO_DXR3_UnableToLoadNewSPUPalette "[VO_DXR3] Impossibile caricare una nuova palette SPU!\n"
 #define MSGTR_LIBVO_DXR3_UnableToSetPlaymode "[VO_DXR3] Impossibile impostare la modalità riproduzione!\n"
 #define MSGTR_LIBVO_DXR3_UnableToSetSubpictureMode "[VO_DXR3] Impossibile impostare la modalità subpicture!\n"
@@ -1770,7 +1738,6 @@ static char help_text[]=
 #define MSGTR_LIBVO_DXR3_FailedSetSignalMix "[VO_DXR3] Impossibile impostare il mix segnale!\n"
 
 // libvo/font_load_ft.c
-
 #define MSGTR_LIBVO_FONT_LOAD_FT_NewFaceFailed "New_Face in errore. Forse il percorso del font è errato.\nPer favore indica il file dei font per il testo (~/.mplayer/subfont.ttf).\n"
 #define MSGTR_LIBVO_FONT_LOAD_FT_NewMemoryFaceFailed "New_Memory_Face in errore..\n"
 #define MSGTR_LIBVO_FONT_LOAD_FT_SubFaceFailed "font sottotitoli: load_sub_face in errore.\n"
@@ -1781,15 +1748,12 @@ static char help_text[]=
 #define MSGTR_LIBVO_FONT_LOAD_FT_DoneFreeTypeFailed "FT_Done_FreeType in errore.\n"
 
 // libvo/vo_mga.c
-
 #define MSGTR_LIBVO_MGA_AspectResized "[VO_MGA] aspect(): ridimensionato a %dx%d.\n"
 
 // libvo/vo_null.c
-
 #define MSGTR_LIBVO_NULL_UnknownSubdevice "[VO_NULL] Sottodispositivo sconosciuto: %s.\n"
 
 // libvo/vo_png.c
-
 #define MSGTR_LIBVO_PNG_Warning1 "[VO_PNG] Attenzine: livello compressione a 0, compressione disabilitata!\n"
 #define MSGTR_LIBVO_PNG_Warning2 "[VO_PNG] Info: Usa -vo png:z=<n> per impostare il livello compressione da 0 a 9.\n"
 #define MSGTR_LIBVO_PNG_Warning3 "[VO_PNG] Info: (0 = nessuna, 1 = più veloce e peggiore - 9 migliore e più lenta)\n"
@@ -1797,7 +1761,6 @@ static char help_text[]=
 #define MSGTR_LIBVO_PNG_ErrorInCreatePng "[VO_PNG] Errore in create_png.\n"
 
 // libvo/vo_sdl.c
-
 #define MSGTR_LIBVO_SDL_CouldntGetAnyAcceptableSDLModeForOutput "[VO_SDL] Impossibile ottenere una modalità SDL accettabile per l'output.\n"
 #define MSGTR_LIBVO_SDL_SetVideoModeFailed "[VO_SDL] set_video_mode: SDL_SetVideoMode fallito: %s.\n"
 #define MSGTR_LIBVO_SDL_SetVideoModeFailedFull "[VO_SDL] Set_fullmode: SDL_SetVideoMode fallito: %s.\n"
@@ -1814,7 +1777,6 @@ static char help_text[]=
 #define MSGTR_LIBVO_SDL_UsingDriver "[VO_SDL] Uso il driver: %s.\n"
 
 // libvo/vobsub_vidix.c
-
 #define MSGTR_LIBVO_SUB_VIDIX_CantStartPlayback "[VO_SUB_VIDIX] Impossibile iniziare la riproduzione: %s\n"
 #define MSGTR_LIBVO_SUB_VIDIX_CantStopPlayback "[VO_SUB_VIDIX] Impossibile terminare la riproduzione: %s\n"
 #define MSGTR_LIBVO_SUB_VIDIX_InterleavedUvForYuv410pNotSupported "[VO_SUB_VIDIX] UV interlacciato per YUV410P non supportato.\n"
@@ -1831,7 +1793,6 @@ static char help_text[]=
 #define MSGTR_LIBVO_SUB_VIDIX_CouldntGetCapability "[VO_SUB_VIDIX] Impossibile ricavare caratteristiche: %s.\n"
 
 // libvo/vo_svga.c
-
 #define MSGTR_LIBVO_SVGA_ForcedVidmodeNotAvailable "[VO_SVGA] Il vid_mode %d (%s) forzato non è disponibile.\n"
 #define MSGTR_LIBVO_SVGA_ForcedVidmodeTooSmall "[VO_SVGA] Il vid_mode %d (%s) è troppo piccolo.\n"
 #define MSGTR_LIBVO_SVGA_VgasetmodeFailed "[VO_SVGA] Errore in vga_setmode(%d).\n"
@@ -1843,7 +1804,6 @@ static char help_text[]=
 #define MSGTR_LIBVO_SVGA_UsingVidix "[VO_SVGA] Uso VIDIX. l=%i a=%i  lm=%i am=%i\n"
 
 // libvo/vo_tdfxfb.c
-
 #define MSGTR_LIBVO_TDFXFB_CantOpen "[VO_TDFXFB] Impossibile aprire %s: %s.\n"
 #define MSGTR_LIBVO_TDFXFB_ProblemWithFbitgetFscreenInfo "[VO_TDFXFB] Problema con l'ioctl FBITGET_FSCREENINFO: %s.\n"
 #define MSGTR_LIBVO_TDFXFB_ProblemWithFbitgetVscreenInfo "[VO_TDFXFB] Problema con l'ioctl FBITGET_VSCREENINFO: %s.\n"
@@ -1856,7 +1816,6 @@ static char help_text[]=
 #define MSGTR_LIBVO_TDFXFB_ScreenIs "[VO_TDFXFB] screen è %dx%d a %d bpp, in è %dx%d a %d bpp, norm è %dx%d.\n"
 
 // libvo/vo_tdfx_vid.c
-
 #define MSGTR_LIBVO_TDFXVID_Move "[VO_TDXVID] Sposta %d(%d) x %d => %d.\n"
 #define MSGTR_LIBVO_TDFXVID_AGPMoveFailedToClearTheScreen "[VO_TDFXVID] L'AGP move non ha potuto ripulire lo schermo.\n"
 #define MSGTR_LIBVO_TDFXVID_BlitFailed "[VO_TDFXVID] Blit fallito.\n"
@@ -1878,11 +1837,9 @@ static char help_text[]=
 #define MSGTR_LIBVO_TDFXVID_UnknownFormat "[VO_TDFXVID] formato sconosciuto: 0x%x.\n"
 
 // libvo/vo_tga.c
-
 #define MSGTR_LIBVO_TGA_UnknownSubdevice "[VO_TGA] Sottodispositivo sconosciuto: %s.\n"
 
 // libvo/vo_vesa.c
-
 #define MSGTR_LIBVO_VESA_FatalErrorOccurred "[VO_VESA] Errore fatale! Impossibile continuare.\n"
 #define MSGTR_LIBVO_VESA_UnknownSubdevice "[VO_VESA] Sottodispositivo sconosciuto: '%s'.\n"
 #define MSGTR_LIBVO_VESA_YouHaveTooLittleVideoMemory "[VO_VESA] Hai troppo poca memoria video per questa modalità:\n[VO_VESA] Richiesta: %08lX presente: %08lX.\n"
@@ -1918,11 +1875,9 @@ static char help_text[]=
 #define MSGTR_LIBVO_VESA_InitializationComplete "[VO_VESA] Inizializzazione VESA completa.\n"
 
 // libvo/vo_x11.c
-
 #define MSGTR_LIBVO_X11_DrawFrameCalled "[VO_X11] chiamata a draw_frame()!!!!!!\n"
 
 // libvo/vo_xv.c
-
 #define MSGTR_LIBVO_XV_DrawFrameCalled "[VO_XV] chiamata a draw_frame()!!!!!!\n"
 #define MSGTR_LIBVO_XV_SharedMemoryNotSupported "[VO_XV] Memoria condivisa non supportata\nRitorno a Xv normale.\n"
 #define MSGTR_LIBVO_XV_XvNotSupportedByX11 "[VO_XV] Scusa, Xv non è gestito dalla versione/driver di X11 corrente\n[VO_XV] ******** Prova con  -vo x11  o  -vo sdl  *********\n"
@@ -1941,12 +1896,10 @@ static char help_text[]=
  
 
 // loader/ldt_keeper.c
-
 #define MSGTR_LOADER_DYLD_Warning "ATTENZIONE: Tentativo di utilizzare codec DLL, senza la variabile d'ambiente\n           DYLD_BIND_AT_LAUNCH impostata. Ciò porterà probabilmente a un crash.\n"
 
 
 // stream/stream_radio.c
-
 #define MSGTR_RADIO_ChannelNamesDetected "[radio] Rilevati i nomi dei canali radio.\n"
 #define MSGTR_RADIO_FreqRange "[radio] La gamma delle frequenze permesse è %.2f-%.2f MHz.\n"
 #define MSGTR_RADIO_WrongFreqForChannel "[radio] Frequenza errata per il canale %s\n"
@@ -1989,6 +1942,7 @@ static char help_text[]=
 #define MSGTR_RADIO_DriverBSDBT848 "[radio] Utilizzo l'interfaccia radio *BSD BT848.\n"
 #define MSGTR_RADIO_AvailableDrivers "[radio] Driver disponibili: "
 
+
 // ================================== LIBASS ====================================
 
 // ass_bitmap.c
diff --git a/liba52/bitstream.h b/liba52/bitstream.h
index 071fe72906..63b1823b17 100644
--- a/liba52/bitstream.h
+++ b/liba52/bitstream.h
@@ -26,12 +26,6 @@
  */
 
 /* code from ffmpeg/libavcodec */
-#if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC_ == 3 && __GNUC_MINOR__ > 0)
-#    define always_inline __attribute__((always_inline)) inline
-#else
-#    define always_inline inline
-#endif
-
 #if defined(__sparc__) || defined(hpux)
 /*
  * the alt bitstream reader performs unaligned memory accesses; that doesn't work
@@ -43,11 +37,11 @@
 #define ALT_BITSTREAM_READER
 
 /* used to avoid misaligned exceptions on some archs (alpha, ...) */
-#if defined (ARCH_X86) || defined(ARCH_ARMV4L)
+#if defined (ARCH_X86) || defined(HAVE_ARMV6)
 #    define unaligned32(a) (*(uint32_t*)(a))
 #else
 #    ifdef __GNUC__
-static always_inline uint32_t unaligned32(const void *v) {
+static inline uint32_t unaligned32(const void *v) {
     struct Unaligned {
 	uint32_t i;
     } __attribute__((packed));
@@ -86,7 +80,7 @@ static inline uint32_t unaligned32(const void *v) {
 #	else
 
 #	define swab32(x) __generic_swab32(x)
-	static always_inline const uint32_t __generic_swab32(uint32_t x)
+	static inline const uint32_t __generic_swab32(uint32_t x)
 	{
 		return ((((uint8_t*)&x)[0] << 24) | (((uint8_t*)&x)[1] << 16) |
 		 (((uint8_t*)&x)[2] << 8)  | (((uint8_t*)&x)[3]));
diff --git a/liba52/downmix.c b/liba52/downmix.c
index 91c21a2ef7..13220db719 100644
--- a/liba52/downmix.c
+++ b/liba52/downmix.c
@@ -1014,39 +1014,6 @@ static void zero_MMX(sample_t * samples)
 	);
 }
 
-/*
- I hope dest and src will be at least 8 byte aligned and size
- will devide on 8 without remain
- Note: untested and unused.
-*/
-static void copy_MMX(void *dest,const void *src,unsigned size)
-{
-  unsigned i;
-  size /= 64;
-	for(i=0;i<size;i++)
-	{
-	    __asm __volatile(
-		"movq	%0,   %%mm0\n\t"
-		"movq	8%0,  %%mm1\n\t"
-		"movq	16%0, %%mm2\n\t"
-		"movq	24%0, %%mm3\n\t"
-		"movq	32%0, %%mm4\n\t"
-		"movq	40%0, %%mm5\n\t"
-		"movq	48%0, %%mm6\n\t"
-		"movq	56%0, %%mm7\n\t"
-		"movq	%%mm0, %1\n\t"
-		"movq	%%mm1, 8%1\n\t"
-		"movq	%%mm2, 16%1\n\t"
-		"movq	%%mm3, 24%1\n\t"
-		"movq	%%mm4, 32%1\n\t"
-		"movq	%%mm5, 40%1\n\t"
-		"movq	%%mm6, 48%1\n\t"
-		"movq	%%mm7, 56%1\n\t"
-		:
-		:"m"(src),"m"(dest));
-	}
-}
-
 static void downmix_SSE (sample_t * samples, int acmod, int output, sample_t bias,
 	      sample_t clev, sample_t slev)
 {
diff --git a/liba52/liba52_changes.diff b/liba52/liba52_changes.diff
index 1a7451902c..542424ba83 100644
--- a/liba52/liba52_changes.diff
+++ b/liba52/liba52_changes.diff
@@ -75,17 +75,11 @@
  
 --- liba52/bitstream.h	2006-06-12 15:05:07.000000000 +0200
 +++ liba52/bitstream.h	2006-06-05 02:23:02.000000000 +0200
-@@ -21,6 +25,48 @@
+@@ -21,6 +25,42 @@
   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   */
  
 +/* code from ffmpeg/libavcodec */
-+#if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC_ == 3 && __GNUC_MINOR__ > 0)
-+#    define always_inline __attribute__((always_inline)) inline
-+#else
-+#    define always_inline inline
-+#endif
-+
 +#if defined(__sparc__) || defined(hpux)
 +/*
 + * the alt bitstream reader performs unaligned memory accesses; that doesn't work
@@ -97,11 +91,11 @@
 +#define ALT_BITSTREAM_READER
 +
 +/* used to avoid misaligned exceptions on some archs (alpha, ...) */
-+#if defined (ARCH_X86) || defined(ARCH_ARMV4L)
++#if defined (ARCH_X86) || defined(HAVE_ARMV6)
 +#    define unaligned32(a) (*(uint32_t*)(a))
 +#else
 +#    ifdef __GNUC__
-+static always_inline uint32_t unaligned32(const void *v) {
++static inline uint32_t unaligned32(const void *v) {
 +    struct Unaligned {
 +	uint32_t i;
 +    } __attribute__((packed));
@@ -142,7 +136,7 @@
 - (((uint8_t*)&x)[2] << 8)  | (((uint8_t*)&x)[3]))
 -
 +#	define swab32(x) __generic_swab32(x)
-+	static always_inline const uint32_t __generic_swab32(uint32_t x)
++	static inline const uint32_t __generic_swab32(uint32_t x)
 +	{
 +		return ((((uint8_t*)&x)[0] << 24) | (((uint8_t*)&x)[1] << 16) |
 +		 (((uint8_t*)&x)[2] << 8)  | (((uint8_t*)&x)[3]));
@@ -290,7 +284,7 @@
  {
      switch (CONVERT (acmod, output & A52_CHANNEL_MASK)) {
  
-@@ -653,3 +685,1137 @@
+@@ -653,3 +685,1104 @@
  	goto mix_31to21;
      }
  }
@@ -623,39 +617,6 @@
 +	);
 +}
 +
-+/*
-+ I hope dest and src will be at least 8 byte aligned and size
-+ will devide on 8 without remain
-+ Note: untested and unused.
-+*/
-+static void copy_MMX(void *dest,const void *src,unsigned size)
-+{
-+  unsigned i;
-+  size /= 64;
-+	for(i=0;i<size;i++)
-+	{
-+	    __asm __volatile(
-+		"movq	%0,   %%mm0\n\t"
-+		"movq	8%0,  %%mm1\n\t"
-+		"movq	16%0, %%mm2\n\t"
-+		"movq	24%0, %%mm3\n\t"
-+		"movq	32%0, %%mm4\n\t"
-+		"movq	40%0, %%mm5\n\t"
-+		"movq	48%0, %%mm6\n\t"
-+		"movq	56%0, %%mm7\n\t"
-+		"movq	%%mm0, %1\n\t"
-+		"movq	%%mm1, 8%1\n\t"
-+		"movq	%%mm2, 16%1\n\t"
-+		"movq	%%mm3, 24%1\n\t"
-+		"movq	%%mm4, 32%1\n\t"
-+		"movq	%%mm5, 40%1\n\t"
-+		"movq	%%mm6, 48%1\n\t"
-+		"movq	%%mm7, 56%1\n\t"
-+		:
-+		:"m"(src),"m"(dest));
-+	}
-+}
-+
 +static void downmix_SSE (sample_t * samples, int acmod, int output, sample_t bias,
 +	      sample_t clev, sample_t slev)
 +{
diff --git a/libao2/ao_mpegpes.c b/libao2/ao_mpegpes.c
index c6c66cd5ff..583ca44cf5 100644
--- a/libao2/ao_mpegpes.c
+++ b/libao2/ao_mpegpes.c
@@ -10,8 +10,8 @@
 
 #include "config.h"
 
-#ifdef HAVE_DVB
-#include <sys/poll.h>
+#ifdef CONFIG_DVB
+#include <poll.h>
 #include <sys/ioctl.h>
 #endif
 
@@ -25,8 +25,8 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#ifdef HAVE_DVB
-#ifndef HAVE_DVB_HEAD
+#ifdef CONFIG_DVB
+#ifndef CONFIG_DVB_HEAD
 #include <ost/audio.h>
 audioMixer_t dvb_mixer={255,255};
 #else
@@ -45,7 +45,7 @@ int vo_mpegpes_fd2 = -1;
 
 static ao_info_t info = 
 {
-#ifdef HAVE_DVB
+#ifdef CONFIG_DVB
 	"DVB audio output",
 #else
 	"MPEG-PES audio output",
@@ -60,7 +60,7 @@ LIBAO_EXTERN(mpegpes)
 
 // to set/get/query special features/parameters
 static int control(int cmd,void *arg){
-#ifdef HAVE_DVB
+#ifdef CONFIG_DVB
     switch(cmd){
 	case AOCONTROL_GET_VOLUME:
 	  if(vo_mpegpes_fd2>=0){
@@ -92,11 +92,11 @@ static int control(int cmd,void *arg){
 static int freq=0;
 static int freq_id=0;
 
-#ifdef HAVE_DVB
+#ifdef CONFIG_DVB
 static int init_device(int card)
 {
 	char ao_file[30];
-#ifndef HAVE_DVB_HEAD
+#ifndef CONFIG_DVB_HEAD
 	mp_msg(MSGT_VO,MSGL_INFO, "Opening /dev/ost/audio\n");
 	sprintf(ao_file, "/dev/ost/audio");
 #else
@@ -171,7 +171,7 @@ static int preinit(const char *arg)
 	}
 	card--;
 
-#ifdef HAVE_DVB
+#ifdef CONFIG_DVB
 	if(!ao_file)
 		return init_device(card);
 #else	
@@ -190,7 +190,7 @@ static int preinit(const char *arg)
 
 static int my_ao_write(const unsigned char* data,int len){
     int orig_len = len;
-#ifdef HAVE_DVB
+#ifdef CONFIG_DVB
 #define NFD   1
     struct pollfd pfd[NFD];
 
diff --git a/libao2/ao_nas.c b/libao2/ao_nas.c
index 4888cfc366..5428c7489f 100644
--- a/libao2/ao_nas.c
+++ b/libao2/ao_nas.c
@@ -41,6 +41,7 @@
 #include "audio_out_internal.h"
 #include "libaf/af_format.h"
 
+/* NAS_FRAG_SIZE must be a power-of-two value */
 #define NAS_FRAG_SIZE 4096
 
 static char *nas_event_types[] = {
@@ -116,8 +117,8 @@ struct ao_nas_data {
 	unsigned int state;
 	int expect_underrun;
 
-	void *client_buffer;
-	void *server_buffer;
+	char *client_buffer;
+	char *server_buffer;
 	unsigned int client_buffer_size;
 	unsigned int client_buffer_used;
 	unsigned int server_buffer_size;
@@ -139,7 +140,7 @@ static void nas_print_error(AuServer *aud, const char *prefix, AuStatus as)
 	mp_msg(MSGT_AO, MSGL_ERR, "ao_nas: %s: returned status %d (%s)\n", prefix, as, s);
 }
 
-static int nas_readBuffer(struct ao_nas_data *nas_data, int num)
+static int nas_readBuffer(struct ao_nas_data *nas_data, unsigned int num)
 {
 	AuStatus as;
 
@@ -187,7 +188,7 @@ static int nas_readBuffer(struct ao_nas_data *nas_data, int num)
 	return num;
 }
 
-static int nas_writeBuffer(struct ao_nas_data *nas_data, void *data, int len)
+static int nas_writeBuffer(struct ao_nas_data *nas_data, void *data, unsigned int len)
 {
 	pthread_mutex_lock(&nas_data->buffer_mutex);
 	mp_msg(MSGT_AO, MSGL_DBG2, "ao_nas: nas_writeBuffer(): len=%d client=%d/%d server=%d/%d\n",
@@ -260,7 +261,7 @@ static AuBool nas_event_handler(AuServer *aud, AuEvent *ev, AuEventHandlerRec *h
 		nas_state(event->prev_state),
 		nas_state(event->cur_state),
 		nas_reason(event->reason),
-		event->num_bytes,
+		(int)event->num_bytes,
 		nas_data->expect_underrun);
 
 	if (event->num_bytes > INT_MAX) {
@@ -301,7 +302,7 @@ static AuBool nas_event_handler(AuServer *aud, AuEvent *ev, AuEventHandlerRec *h
 		}
 		mp_msg(MSGT_AO, MSGL_DBG2,
 			"ao_nas: Can't refill buffer, stopping flow.\n");
-		AuStopFlow(nas_data->aud, nas_data->flow, NULL);
+		AuStopFlow(aud, nas_data->flow, NULL);
 		break;
 	default:
 		break;
@@ -361,7 +362,7 @@ static int control(int cmd, void *arg)
 		vol->right = (float)nas_data->gain/AU_FIXED_POINT_SCALE*50;
 		vol->left = vol->right;
 
-		mp_msg(MSGT_AO, MSGL_DBG2, "ao_nas: AOCONTROL_GET_VOLUME: %08x\n", nas_data->gain);
+		mp_msg(MSGT_AO, MSGL_DBG2, "ao_nas: AOCONTROL_GET_VOLUME: %.2f\n", vol->right);
 		retval = CONTROL_OK;
 		break;
 
@@ -372,7 +373,7 @@ static int control(int cmd, void *arg)
 		 * so i take the mean of both values.
 		 */
 		nas_data->gain = AU_FIXED_POINT_SCALE*((vol->left+vol->right)/2)/50;
-		mp_msg(MSGT_AO, MSGL_DBG2, "ao_nas: AOCONTROL_SET_VOLUME: %08x\n", nas_data->gain);
+		mp_msg(MSGT_AO, MSGL_DBG2, "ao_nas: AOCONTROL_SET_VOLUME: %.2f\n", (vol->left+vol->right)/2);
 
 		aep.parameters[AuParmsMultiplyConstantConstant]=nas_data->gain;
 		aep.flow = nas_data->flow;
@@ -402,6 +403,8 @@ static int init(int rate,int channels,int format,int flags)
 	int buffer_size;
 	char *server;
 
+	(void)flags; /* shut up 'unused parameter' warning */
+
 	nas_data=malloc(sizeof(struct ao_nas_data));
 	memset(nas_data, 0, sizeof(struct ao_nas_data));
 
@@ -564,7 +567,7 @@ static int get_space(void)
 // return: number of bytes played
 static int play(void* data,int len,int flags)
 {
-	int maxbursts, playbursts, writelen;
+	int written, maxbursts = 0, playbursts = 0;
 	AuStatus as;
 
 	mp_msg(MSGT_AO, MSGL_DBG3,
@@ -574,18 +577,27 @@ static int play(void* data,int len,int flags)
 	if (len == 0)
 		return 0;
 
-	pthread_mutex_lock(&nas_data->buffer_mutex);
-	maxbursts = (nas_data->client_buffer_size -
-		     nas_data->client_buffer_used) / ao_data.outburst;
-	playbursts = len / ao_data.outburst;
-	writelen = (playbursts > maxbursts ? maxbursts : playbursts) *
-		   ao_data.outburst;
-	pthread_mutex_unlock(&nas_data->buffer_mutex);
+	if (!(flags & AOPLAY_FINAL_CHUNK)) {
+		pthread_mutex_lock(&nas_data->buffer_mutex);
+		maxbursts = (nas_data->client_buffer_size -
+			     nas_data->client_buffer_used) / ao_data.outburst;
+		playbursts = len / ao_data.outburst;
+		len = (playbursts > maxbursts ? maxbursts : playbursts) *
+			   ao_data.outburst;
+		pthread_mutex_unlock(&nas_data->buffer_mutex);
+	}
 
-	writelen = nas_writeBuffer(nas_data, data, writelen);
+	/*
+	 * If AOPLAY_FINAL_CHUNK is set, we did not actually check len fits
+	 * into the available buffer space, but mplayer.c shouldn't give us
+	 * more to play than we report to it by get_space(), so this should be
+	 * fine.
+	 */
+	written = nas_writeBuffer(nas_data, data, len);
 
 	if (nas_data->state != AuStateStart &&
-	    maxbursts == playbursts) {
+	    (maxbursts == playbursts ||
+	     flags & AOPLAY_FINAL_CHUNK)) {
 		mp_msg(MSGT_AO, MSGL_DBG2, "ao_nas: play(): Starting flow.\n");
 		nas_data->expect_underrun = 1;
 		AuStartFlow(nas_data->aud, nas_data->flow, &as);
@@ -593,7 +605,7 @@ static int play(void* data,int len,int flags)
 			nas_print_error(nas_data->aud, "play(): AuStartFlow", as);
 	}
 
-	return writelen;
+	return written;
 }
 
 // return: delay in seconds between first and last sample in buffer
diff --git a/libao2/ao_oss.c b/libao2/ao_oss.c
index b9939de8b7..ed70152077 100644
--- a/libao2/ao_oss.c
+++ b/libao2/ao_oss.c
@@ -166,7 +166,7 @@ static int control(int cmd,void *arg){
 	{
 	    int format;
 	    if (!ioctl(audio_fd, SNDCTL_DSP_GETFMTS, &format))
-		if (format & (int)arg)
+		if ((unsigned int)format & (unsigned long)arg)
 	    	    return CONTROL_TRUE;
 	    return CONTROL_FALSE;
 	}
diff --git a/libdvdcss/common.h b/libdvdcss/common.h
index 8e97fc3ab1..aff5ccbaa7 100644
--- a/libdvdcss/common.h
+++ b/libdvdcss/common.h
@@ -5,7 +5,7 @@
  * Copyright (C) 1998, 1999, 2000 VideoLAN
  * $Id$
  *
- * Authors: Samuel Hocevar <sam@via.ecp.fr>
+ * Authors: Sam Hocevar <sam@via.ecp.fr>
  *          Vincent Seguin <seguin@via.ecp.fr>
  *          Gildas Bazin <gbazin@netcourrier.com>
  *
diff --git a/libdvdcss/css.c b/libdvdcss/css.c
index a704a3fcf9..4e24bbf68f 100644
--- a/libdvdcss/css.c
+++ b/libdvdcss/css.c
@@ -1,11 +1,11 @@
 /*****************************************************************************
  * css.c: Functions for DVD authentication and descrambling
  *****************************************************************************
- * Copyright (C) 1999-2003 VideoLAN
+ * Copyright (C) 1999-2008 VideoLAN
  * $Id$
  *
- * Authors: St�phane Borel <stef@via.ecp.fr>
- *          H�kan Hjort <d95hjort@dtek.chalmers.se>
+ * Authors: Stéphane Borel <stef@via.ecp.fr>
+ *          Håkan Hjort <d95hjort@dtek.chalmers.se>
  *
  * based on:
  *  - css-auth by Derek Fawcus <derek@spider.com>
@@ -325,6 +325,7 @@ int _dvdcss_disckey( dvdcss_t dvdcss )
                                  "cracking title keys instead" );
 
             /* Fallback, but not to DISC as the disc key might be faulty */
+            memset( p_disc_key, 0, KEY_SIZE );
             dvdcss->i_method = DVDCSS_METHOD_TITLE;
             break;
 
diff --git a/libdvdcss/css.h b/libdvdcss/css.h
index 82f64f8951..03becda17c 100644
--- a/libdvdcss/css.h
+++ b/libdvdcss/css.h
@@ -4,7 +4,7 @@
  * Copyright (C) 1999-2001 VideoLAN
  * $Id$
  *
- * Author: St�phane Borel <stef@via.ecp.fr>
+ * Author: Stéphane Borel <stef@via.ecp.fr>
  *
  * based on:
  *  - css-auth by Derek Fawcus <derek@spider.com>
diff --git a/libdvdcss/csstables.h b/libdvdcss/csstables.h
index fb3cdfef47..bd0fc3a706 100644
--- a/libdvdcss/csstables.h
+++ b/libdvdcss/csstables.h
@@ -4,7 +4,7 @@
  * Copyright (C) 1999-2001 VideoLAN
  * $Id$
  *
- * Author: St�phane Borel <stef@via.ecp.fr>
+ * Author: Stéphane Borel <stef@via.ecp.fr>
  *
  * based on:
  *  - css-auth by Derek Fawcus <derek@spider.com>
diff --git a/libdvdcss/device.c b/libdvdcss/device.c
index 8185f17d21..0d8e4a06ee 100644
--- a/libdvdcss/device.c
+++ b/libdvdcss/device.c
@@ -4,9 +4,9 @@
  * Copyright (C) 1998-2006 VideoLAN
  * $Id$
  *
- * Authors: St�phane Borel <stef@via.ecp.fr>
+ * Authors: Stéphane Borel <stef@via.ecp.fr>
  *          Sam Hocevar <sam@zoy.org>
- *          H�kan Hjort <d95hjort@dtek.chalmers.se>
+ *          Håkan Hjort <d95hjort@dtek.chalmers.se>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/libdvdcss/device.h b/libdvdcss/device.h
index 867703172b..d8a73f0d4e 100644
--- a/libdvdcss/device.h
+++ b/libdvdcss/device.h
@@ -4,9 +4,9 @@
  * Copyright (C) 1998-2002 VideoLAN
  * $Id$
  *
- * Authors: St�phane Borel <stef@via.ecp.fr>
- *          Samuel Hocevar <sam@zoy.org>
- *          H�kan Hjort <d95hjort@dtek.chalmers.se>
+ * Authors: Stéphane Borel <stef@via.ecp.fr>
+ *          Sam Hocevar <sam@zoy.org>
+ *          Håkan Hjort <d95hjort@dtek.chalmers.se>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/libdvdcss/dvdcss/dvdcss.h b/libdvdcss/dvdcss/dvdcss.h
index 959e796ceb..c97f996824 100644
--- a/libdvdcss/dvdcss/dvdcss.h
+++ b/libdvdcss/dvdcss/dvdcss.h
@@ -1,7 +1,7 @@
 /**
  * \file dvdcss.h
- * \author St�phane Borel <stef@via.ecp.fr>
- * \author Samuel Hocevar <sam@zoy.org>
+ * \author Stéphane Borel <stef@via.ecp.fr>
+ * \author Sam Hocevar <sam@zoy.org>
  * \brief The \e libdvdcss public header.
  *
  * This header contains the public types and functions that applications
@@ -9,7 +9,7 @@
  */
 
 /*
- * Copyright (C) 1998-2002 VideoLAN
+ * Copyright (C) 1998-2008 VideoLAN
  * $Id$
  *
  * This program is free software; you can redistribute it and/or modify
@@ -88,6 +88,8 @@ LIBDVDCSS_EXPORT int      dvdcss_readv ( dvdcss_t,
                                int i_flags );
 LIBDVDCSS_EXPORT char *   dvdcss_error ( dvdcss_t );
 
+LIBDVDCSS_EXPORT int      dvdcss_is_scrambled ( dvdcss_t );
+
 
 /*
  * Deprecated stuff.
diff --git a/libdvdcss/error.c b/libdvdcss/error.c
index d5c416ff61..66d2b67ad4 100644
--- a/libdvdcss/error.c
+++ b/libdvdcss/error.c
@@ -4,7 +4,7 @@
  * Copyright (C) 1998-2002 VideoLAN
  * $Id$
  *
- * Author: Samuel Hocevar <sam@zoy.org>
+ * Author: Sam Hocevar <sam@zoy.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/libdvdcss/ioctl.c b/libdvdcss/ioctl.c
index 119a7afc2a..d0903994c7 100644
--- a/libdvdcss/ioctl.c
+++ b/libdvdcss/ioctl.c
@@ -5,11 +5,11 @@
  * $Id$
  *
  * Authors: Markus Kuespert <ltlBeBoy@beosmail.com>
- *          Samuel Hocevar <sam@zoy.org>
+ *          Sam Hocevar <sam@zoy.org>
  *          Jon Lech Johansen <jon-vl@nanocrew.net>
- *          H�kan Hjort <d95hjort@dtek.chalmers.se>
+ *          Håkan Hjort <d95hjort@dtek.chalmers.se>
  *          Eugenio Jarosiewicz <ej0@cise.ufl.edu>
- *          David Sieb�rger <drs-videolan@rucus.ru.ac.za>
+ *          David Siebörger <drs-videolan@rucus.ru.ac.za>
  *          Alex Strelnikov <lelik@os2.ru>
  *          Gildas Bazin <gbazin@netcourrier.com>
  *
diff --git a/libdvdcss/ioctl.h b/libdvdcss/ioctl.h
index aa33b50ba1..16f51d251b 100644
--- a/libdvdcss/ioctl.h
+++ b/libdvdcss/ioctl.h
@@ -4,7 +4,7 @@
  * Copyright (C) 1999-2001 VideoLAN
  * $Id$
  *
- * Authors: Samuel Hocevar <sam@zoy.org>
+ * Authors: Sam Hocevar <sam@zoy.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/libdvdcss/libdvdcss.c b/libdvdcss/libdvdcss.c
index 9d992d635d..1be814f838 100644
--- a/libdvdcss/libdvdcss.c
+++ b/libdvdcss/libdvdcss.c
@@ -1,10 +1,10 @@
 /* libdvdcss.c: DVD reading library.
  *
- * Authors: St�phane Borel <stef@via.ecp.fr>
- *          Samuel Hocevar <sam@zoy.org>
- *          H�kan Hjort <d95hjort@dtek.chalmers.se>
+ * Authors: Stéphane Borel <stef@via.ecp.fr>
+ *          Sam Hocevar <sam@zoy.org>
+ *          Håkan Hjort <d95hjort@dtek.chalmers.se>
  *
- * Copyright (C) 1998-2002 VideoLAN
+ * Copyright (C) 1998-2008 VideoLAN
  * $Id$
  *
  * This program is free software; you can redistribute it and/or modify
@@ -371,10 +371,13 @@ LIBDVDCSS_EXPORT dvdcss_t dvdcss_open ( char *psz_target )
 
         if( i_ret < 0 )
         {
-            print_debug( dvdcss,
-                         "could not get disc key" );
+            print_debug( dvdcss, "could not get disc key" );
         }
     }
+    else
+    {
+        memset( dvdcss->css.p_disc_key, 0, KEY_SIZE );
+    }
 
     /* If the cache is enabled, write the cache directory tag */
     if( psz_cache )
@@ -470,7 +473,7 @@ LIBDVDCSS_EXPORT dvdcss_t dvdcss_open ( char *psz_target )
             {
                 char psz_tmp[16 + 1];
                 sprintf( psz_tmp,
-                         "%.2"PRIx8"%.2"PRIx8"%.2"PRIx8"%.2"PRIx8"%.2"PRIx8"%.2"PRIx8"%.2"PRIx8"%.2"PRIx8"",
+                         "%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x",
                          psz_serial[0], psz_serial[1], psz_serial[2],
                          psz_serial[3], psz_serial[4], psz_serial[5],
                          psz_serial[6], psz_serial[7] );
@@ -486,7 +489,7 @@ LIBDVDCSS_EXPORT dvdcss_t dvdcss_open ( char *psz_target )
              psz_key[0] = '-';
              for( i = 0; i < KEY_SIZE; i++ )
              {
-                 sprintf( &psz_key[1+i*2], "%.2"PRIx8, dvdcss->css.p_disc_key[i] );
+                 sprintf( &psz_key[1+i*2], "%.2x", dvdcss->css.p_disc_key[i] );
              }
              psz_key[1 + KEY_SIZE * 2] = '\0';
         }
@@ -793,3 +796,16 @@ LIBDVDCSS_EXPORT int dvdcss_title ( dvdcss_t dvdcss, int i_block )
     return _dvdcss_title( dvdcss, i_block );
 }
 
+/**
+ * \brief Return 1 if the DVD is scrambled, 0 otherwise.
+ *
+ * \param dvdcss a \e libdvdcss instance.
+ * \return 1 if the DVD is scrambled, 0 otherwise.
+ *
+ * This function returns whether the DVD is scrambled.
+ */
+LIBDVDCSS_EXPORT int dvdcss_is_scrambled ( dvdcss_t dvdcss )
+{
+    return dvdcss->b_scrambled;
+}
+
diff --git a/libdvdcss/libdvdcss.h b/libdvdcss/libdvdcss.h
index 9fad5d84ce..80f78c3062 100644
--- a/libdvdcss/libdvdcss.h
+++ b/libdvdcss/libdvdcss.h
@@ -4,8 +4,8 @@
  * Copyright (C) 1998-2001 VideoLAN
  * $Id$
  *
- * Authors: St�phane Borel <stef@via.ecp.fr>
- *          Samuel Hocevar <sam@zoy.org>
+ * Authors: Stéphane Borel <stef@via.ecp.fr>
+ *          Sam Hocevar <sam@zoy.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/dvdread/bswap.h b/libdvdread/bswap.h
index 92afd07c88..92afd07c88 100644
--- a/dvdread/bswap.h
+++ b/libdvdread/bswap.h
diff --git a/dvdread/cmd_print.c b/libdvdread/cmd_print.c
index fd3bdc1382..fd3bdc1382 100644
--- a/dvdread/cmd_print.c
+++ b/libdvdread/cmd_print.c
diff --git a/dvdread/cmd_print.h b/libdvdread/cmd_print.h
index 92c746cec3..0f1ee74ddb 100644
--- a/dvdread/cmd_print.h
+++ b/libdvdread/cmd_print.h
@@ -20,7 +20,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <dvdread/ifo_types.h>
+#include <libdvdread/ifo_types.h>
 
 /**
  * Pretty printing of the DVD commands (vm instructions).
diff --git a/dvdread/dvd_input.c b/libdvdread/dvd_input.c
index 35359821bd..35359821bd 100644
--- a/dvdread/dvd_input.c
+++ b/libdvdread/dvd_input.c
diff --git a/dvdread/dvd_input.h b/libdvdread/dvd_input.h
index 607619e2d0..607619e2d0 100644
--- a/dvdread/dvd_input.h
+++ b/libdvdread/dvd_input.h
diff --git a/dvdread/dvd_reader.c b/libdvdread/dvd_reader.c
index 49140544e4..49140544e4 100644
--- a/dvdread/dvd_reader.c
+++ b/libdvdread/dvd_reader.c
diff --git a/dvdread/dvd_reader.h b/libdvdread/dvd_reader.h
index 17ab52a694..17ab52a694 100644
--- a/dvdread/dvd_reader.h
+++ b/libdvdread/dvd_reader.h
diff --git a/dvdread/dvd_udf.c b/libdvdread/dvd_udf.c
index 0e31c36552..0e31c36552 100644
--- a/dvdread/dvd_udf.c
+++ b/libdvdread/dvd_udf.c
diff --git a/dvdread/dvd_udf.h b/libdvdread/dvd_udf.h
index 5005ed6398..5005ed6398 100644
--- a/dvdread/dvd_udf.h
+++ b/libdvdread/dvd_udf.h
diff --git a/dvdread/dvdread_internal.h b/libdvdread/dvdread_internal.h
index 47a0efe854..47a0efe854 100644
--- a/dvdread/dvdread_internal.h
+++ b/libdvdread/dvdread_internal.h
diff --git a/dvdread/ifo_print.c b/libdvdread/ifo_print.c
index 39ad59efcf..39ad59efcf 100644
--- a/dvdread/ifo_print.c
+++ b/libdvdread/ifo_print.c
diff --git a/dvdread/ifo_print.h b/libdvdread/ifo_print.h
index 514208f99f..f50e764ba9 100644
--- a/dvdread/ifo_print.h
+++ b/libdvdread/ifo_print.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <dvdread/ifo_types.h>
-#include <dvdread/dvd_reader.h>
+#include <libdvdread/ifo_types.h>
+#include <libdvdread/dvd_reader.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/dvdread/ifo_read.c b/libdvdread/ifo_read.c
index 2a430661b7..2a430661b7 100644
--- a/dvdread/ifo_read.c
+++ b/libdvdread/ifo_read.c
diff --git a/dvdread/ifo_read.h b/libdvdread/ifo_read.h
index 202fedce50..8a46b78e0e 100644
--- a/dvdread/ifo_read.h
+++ b/libdvdread/ifo_read.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <dvdread/ifo_types.h>
-#include <dvdread/dvd_reader.h>
+#include <libdvdread/ifo_types.h>
+#include <libdvdread/dvd_reader.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/dvdread/ifo_types.h b/libdvdread/ifo_types.h
index 01972f4ed6..7edf64d9f7 100644
--- a/dvdread/ifo_types.h
+++ b/libdvdread/ifo_types.h
@@ -25,7 +25,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <dvdread/dvd_reader.h>
+#include <libdvdread/dvd_reader.h>
 
 #if defined(__BEOS__)
 #if !defined(_INTTYPES_H_) && !defined(_INTTYPES_H) && !defined(_STDINT_H_) && !defined(_STDINT_H)
diff --git a/dvdread/libdvdread_changes.diff b/libdvdread/libdvdread_changes.diff
index f0177aa5e5..f0177aa5e5 100644
--- a/dvdread/libdvdread_changes.diff
+++ b/libdvdread/libdvdread_changes.diff
diff --git a/dvdread/md5.c b/libdvdread/md5.c
index 72bc36fa64..72bc36fa64 100644
--- a/dvdread/md5.c
+++ b/libdvdread/md5.c
diff --git a/dvdread/md5.h b/libdvdread/md5.h
index 345361a8f2..345361a8f2 100644
--- a/dvdread/md5.h
+++ b/libdvdread/md5.h
diff --git a/dvdread/nav_print.c b/libdvdread/nav_print.c
index 8b1db1c54c..8b1db1c54c 100644
--- a/dvdread/nav_print.c
+++ b/libdvdread/nav_print.c
diff --git a/dvdread/nav_print.h b/libdvdread/nav_print.h
index 0cef79f551..b01e82ba56 100644
--- a/dvdread/nav_print.h
+++ b/libdvdread/nav_print.h
@@ -21,7 +21,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <dvdread/nav_types.h>
+#include <libdvdread/nav_types.h>
 
 /**
  * Pretty printing of the NAV packets, PCI and DSI structs.
diff --git a/dvdread/nav_read.c b/libdvdread/nav_read.c
index 9ba685bdca..9ba685bdca 100644
--- a/dvdread/nav_read.c
+++ b/libdvdread/nav_read.c
diff --git a/dvdread/nav_read.h b/libdvdread/nav_read.h
index eb5d2ae552..afbff978d5 100644
--- a/dvdread/nav_read.h
+++ b/libdvdread/nav_read.h
@@ -20,7 +20,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <dvdread/nav_types.h>
+#include <libdvdread/nav_types.h>
 
 /**
  * Parsing of NAV data, PCI and DSI parts.
diff --git a/dvdread/nav_types.h b/libdvdread/nav_types.h
index 3b80097489..b320a90205 100644
--- a/dvdread/nav_types.h
+++ b/libdvdread/nav_types.h
@@ -30,7 +30,7 @@
  * USA
  */
 
-#include <dvdread/ifo_types.h> /* only dvd_time_t, vm_cmd_t and user_ops_t */
+#include <libdvdread/ifo_types.h> /* only dvd_time_t, vm_cmd_t and user_ops_t */
 /* If it's ever removed add a uintX_t test. */
 
 #undef ATTRIBUTE_PACKED
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c
index be3012a795..78e705318d 100644
--- a/libmpcodecs/vd_ffmpeg.c
+++ b/libmpcodecs/vd_ffmpeg.c
@@ -740,7 +740,8 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){
 
     avctx->hurry_up=(flags&3)?((flags&2)?2:1):0;
 
-    if(sh->ds->demuxer->type != DEMUXER_TYPE_LAVF)
+    if(sh->ds->demuxer->type != DEMUXER_TYPE_LAVF &&
+       sh->ds->demuxer->type != DEMUXER_TYPE_LAVF_PREFERRED)
     if(   sh->format == mmioFOURCC('R', 'V', '1', '0')
        || sh->format == mmioFOURCC('R', 'V', '1', '3')
        || sh->format == mmioFOURCC('R', 'V', '2', '0')
diff --git a/libmpcodecs/vd_qtvideo.c b/libmpcodecs/vd_qtvideo.c
index 33aa7b517a..9b5ad87165 100644
--- a/libmpcodecs/vd_qtvideo.c
+++ b/libmpcodecs/vd_qtvideo.c
@@ -66,12 +66,6 @@ static    ComponentResult (*ImageCodecBeginBand)(ComponentInstance      ci,
                                  CodecDecompressParams * params,
                                  ImageSubCodecDecompressRecord * drp,
                                  long                   flags);
-static    ComponentResult (*ImageCodecDrawBand)(ComponentInstance      ci,
-                                 ImageSubCodecDecompressRecord * drp);
-static    ComponentResult (*ImageCodecEndBand)(ComponentInstance      ci,
-                                 ImageSubCodecDecompressRecord * drp,
-                                 OSErr                  result,
-                                 long                   flags);
 static    ComponentResult (*ImageCodecGetCodecInfo)(ComponentInstance      ci,
                                  CodecInfo *            info);
 static    ComponentResult (*ImageCodecPreDecompress)(ComponentInstance      ci,
diff --git a/libmpdemux/asf.h b/libmpdemux/asf.h
index 1f89edf7fb..1e6210e603 100644
--- a/libmpdemux/asf.h
+++ b/libmpdemux/asf.h
@@ -7,20 +7,6 @@
 #include "mpbswap.h"
 
 ///////////////////////
-// MS GUID definition
-///////////////////////
-#ifndef GUID_DEFINED
-#define GUID_DEFINED
-// Size of GUID is 16 bytes!
-typedef struct __attribute__((packed)) {
-	uint32_t	Data1;		// 4 bytes
-	uint16_t	Data2;		// 2 bytes
-	uint16_t	Data3;		// 2 bytes
-	uint8_t		Data4[8];	// 8 bytes
-} GUID_t;
-#endif
-
-///////////////////////
 // ASF Object Header 
 ///////////////////////
 typedef struct __attribute__((packed)) {
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c
index be820a24a7..73b81807c8 100644
--- a/libmpdemux/demux_lavf.c
+++ b/libmpdemux/demux_lavf.c
@@ -95,6 +95,7 @@ static int mp_read(void *opaque, uint8_t *buf, int size) {
 
 static offset_t mp_seek(void *opaque, offset_t pos, int whence) {
     stream_t *stream = opaque;
+    offset_t current_pos;
     mp_msg(MSGT_HEADER,MSGL_DBG2,"mp_seek(%p, %d, %d)\n", stream, (int)pos, whence);
     if(whence == SEEK_CUR)
         pos +=stream_tell(stream);
@@ -111,8 +112,12 @@ static offset_t mp_seek(void *opaque, offset_t pos, int whence) {
         return -1;
     if(pos<stream->end_pos && stream->eof)
         stream_reset(stream);
-    if(stream_seek(stream, pos)==0)
+    current_pos = stream_tell(stream);
+    if(stream_seek(stream, pos)==0) {
+        stream_reset(stream);
+        stream_seek(stream, current_pos);
         return -1;
+    }
 
     return pos - stream->start_pos;
 }
@@ -176,6 +181,7 @@ static const char *preferred_list[] = {
     "mov,mp4,m4a,3gp,3g2,mj2",
     "mpc",
     "mpc8",
+    "matroska",
     NULL
 };
 
@@ -336,8 +342,12 @@ static void handle_stream(demuxer_t *demuxer, AVFormatContext *avfc, int i) {
             sh_video->fps=av_q2d(st->r_frame_rate);
             sh_video->frametime=1/av_q2d(st->r_frame_rate);
             sh_video->format=bih->biCompression;
-            sh_video->aspect=codec->width * codec->sample_aspect_ratio.num
-                               / (float)(codec->height * codec->sample_aspect_ratio.den);
+            if(st->sample_aspect_ratio.num)
+                sh_video->aspect = codec->width  * st->sample_aspect_ratio.num
+                         / (float)(codec->height * st->sample_aspect_ratio.den);
+            else
+                sh_video->aspect=codec->width  * codec->sample_aspect_ratio.num
+                       / (float)(codec->height * codec->sample_aspect_ratio.den);
             sh_video->i_bps=codec->bit_rate/8;
             mp_msg(MSGT_DEMUX,MSGL_DBG2,"aspect= %d*%d/(%d*%d)\n",
                 codec->width, codec->sample_aspect_ratio.num,
diff --git a/libmpdemux/extension.c b/libmpdemux/extension.c
index a1cd2a49d2..88cc17f3a7 100644
--- a/libmpdemux/extension.c
+++ b/libmpdemux/extension.c
@@ -61,6 +61,7 @@ static struct {
 	{ "ac3", DEMUXER_TYPE_LAVF },
         { "ape", DEMUXER_TYPE_LAVF },
         { "apl", DEMUXER_TYPE_LAVF },
+        { "eac3",DEMUXER_TYPE_LAVF },
         { "mac", DEMUXER_TYPE_LAVF },
         { "str", DEMUXER_TYPE_LAVF },
 
diff --git a/libmpdemux/mp_taglists.c b/libmpdemux/mp_taglists.c
index d6e4f94de5..275112ac1a 100644
--- a/libmpdemux/mp_taglists.c
+++ b/libmpdemux/mp_taglists.c
@@ -22,6 +22,8 @@
 #include "libavformat/riff.h"
 
 static const AVCodecTag mp_wav_tags[] = {
+    { CODEC_ID_RA_144,            MKTAG('1', '4', '_', '4')},
+    { CODEC_ID_RA_288,            MKTAG('2', '8', '_', '8')},
     { CODEC_ID_ADPCM_4XM,         MKTAG('4', 'X', 'M', 'A')},
     { CODEC_ID_ADPCM_EA,          MKTAG('A', 'D', 'E', 'A')},
     { CODEC_ID_ADPCM_EA_MAXIS_XA, MKTAG('A', 'D', 'X', 'A')},
@@ -31,6 +33,7 @@ static const AVCodecTag mp_wav_tags[] = {
     { CODEC_ID_AMR_NB,            MKTAG('n', 'b',   0,   0)},
     { CODEC_ID_COOK,              MKTAG('c', 'o', 'o', 'k')},
     { CODEC_ID_DSICINAUDIO,       MKTAG('D', 'C', 'I', 'A')},
+    { CODEC_ID_EAC3,              MKTAG('E', 'A', 'C', '3')},
     { CODEC_ID_INTERPLAY_DPCM,    MKTAG('I', 'N', 'P', 'A')},
     { CODEC_ID_MLP,               MKTAG('M', 'L', 'P', ' ')},
     { CODEC_ID_MUSEPACK7,         MKTAG('M', 'P', 'C', ' ')},
@@ -75,6 +78,10 @@ static const AVCodecTag mp_bmp_tags[] = {
     { CODEC_ID_MOTIONPIXELS,      MKTAG('M', 'V', 'I', '1')},
     { CODEC_ID_RL2,               MKTAG('R', 'L', '2', 'V')},
     { CODEC_ID_ROQ,               MKTAG('R', 'o', 'Q', 'V')},
+    { CODEC_ID_RV10,              MKTAG('R', 'V', '1', '0')},
+    { CODEC_ID_RV20,              MKTAG('R', 'V', '2', '0')},
+    { CODEC_ID_RV30,              MKTAG('R', 'V', '3', '0')},
+    { CODEC_ID_RV40,              MKTAG('R', 'V', '4', '0')},
     { CODEC_ID_THP,               MKTAG('T', 'H', 'P', 'V')},
     { CODEC_ID_TIERTEXSEQVIDEO,   MKTAG('T', 'S', 'E', 'Q')},
     { CODEC_ID_TXD,               MKTAG('T', 'X', 'D', 'V')},
diff --git a/libmpdemux/video.c b/libmpdemux/video.c
index 0e7dfe618c..1faf077840 100644
--- a/libmpdemux/video.c
+++ b/libmpdemux/video.c
@@ -587,6 +587,7 @@ int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char**
       }
       break;
       case DEMUXER_TYPE_LAVF:
+      case DEMUXER_TYPE_LAVF_PREFERRED:
         if((int)sh_video->fps==1000 || (int)sh_video->fps<=1){
           double next_pts = ds_get_next_pts(d_video);
           double d= (next_pts != MP_NOPTS_VALUE) ? next_pts - d_video->pts : d_video->pts-pts1;
diff --git a/libswscale/rgb2rgb.h b/libswscale/rgb2rgb.h
index f2697c65d6..cded1b3557 100644
--- a/libswscale/rgb2rgb.h
+++ b/libswscale/rgb2rgb.h
@@ -23,8 +23,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_RGB2RGB_H
-#define FFMPEG_RGB2RGB_H
+#ifndef SWSCALE_RGB2RGB_H
+#define SWSCALE_RGB2RGB_H
 
 #include <inttypes.h>
 
@@ -139,4 +139,4 @@ extern void (*yvu9_to_yuy2)(const uint8_t *src1, const uint8_t *src2, const uint
 
 void sws_rgb2rgb_init(int flags);
 
-#endif /* FFMPEG_RGB2RGB_H */
+#endif /* SWSCALE_RGB2RGB_H */
diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index ccdeae8185..891f79ac28 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -73,6 +73,11 @@ untested special converters
 #include "libavutil/x86_cpu.h"
 #include "libavutil/bswap.h"
 
+unsigned swscale_version(void)
+{
+    return LIBSWSCALE_VERSION_INT;
+}
+
 #undef MOVNTQ
 #undef PAVGB
 
diff --git a/libswscale/swscale.h b/libswscale/swscale.h
index a0c735b696..98e9b2ee0e 100644
--- a/libswscale/swscale.h
+++ b/libswscale/swscale.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_SWSCALE_H
-#define FFMPEG_SWSCALE_H
+#ifndef SWSCALE_SWSCALE_H
+#define SWSCALE_SWSCALE_H
 
 /**
  * @file swscale.h
@@ -30,7 +30,7 @@
 #include "libavutil/avutil.h"
 
 #define LIBSWSCALE_VERSION_MAJOR 0
-#define LIBSWSCALE_VERSION_MINOR 5
+#define LIBSWSCALE_VERSION_MINOR 6
 #define LIBSWSCALE_VERSION_MICRO 1
 
 #define LIBSWSCALE_VERSION_INT  AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \
@@ -43,6 +43,11 @@
 
 #define LIBSWSCALE_IDENT        "SwS" AV_STRINGIFY(LIBSWSCALE_VERSION)
 
+/**
+ * Returns the LIBSWSCALE_VERSION_INT constant.
+ */
+unsigned swscale_version(void);
+
 /* values for the flags, the stuff on the command line is different */
 #define SWS_FAST_BILINEAR     1
 #define SWS_BILINEAR          2
@@ -143,4 +148,4 @@ struct SwsContext *sws_getCachedContext(struct SwsContext *context,
                                         int dstW, int dstH, int dstFormat, int flags,
                                         SwsFilter *srcFilter, SwsFilter *dstFilter, double *param);
 
-#endif /* FFMPEG_SWSCALE_H */
+#endif /* SWSCALE_SWSCALE_H */
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h
index e904205475..a20b26ef5a 100644
--- a/libswscale/swscale_internal.h
+++ b/libswscale/swscale_internal.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_SWSCALE_INTERNAL_H
-#define FFMPEG_SWSCALE_INTERNAL_H
+#ifndef SWSCALE_SWSCALE_INTERNAL_H
+#define SWSCALE_SWSCALE_INTERNAL_H
 
 #include "config.h"
 
@@ -280,4 +280,4 @@ extern const DECLARE_ALIGNED(8, uint64_t, ff_dither8[2]);
 
 extern const AVClass sws_context_class;
 
-#endif /* FFMPEG_SWSCALE_INTERNAL_H */
+#endif /* SWSCALE_SWSCALE_INTERNAL_H */
diff --git a/libvo/vo_bl.c b/libvo/vo_bl.c
index 1aaa5c888a..fa3f36d2e3 100644
--- a/libvo/vo_bl.c
+++ b/libvo/vo_bl.c
@@ -34,14 +34,9 @@
 
 #include "config.h"
 
-#ifndef HAVE_WINSOCK2
-#define closesocket close
 #include <netdb.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-#else
-#include <winsock2.h>
-#endif
 
 #include "video_out.h"
 #include "video_out_internal.h"
@@ -187,7 +182,7 @@ static int udp_init(bl_host_t *h) {
 	if (connect(h->fd, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
 		mp_msg(MSGT_VO, MSGL_ERR, "couldn't connect socket for %s\n", 
 				h->name);
-		closesocket(h->fd);
+		close(h->fd);
 		return 1;
 	}
 	return 0;
@@ -199,7 +194,7 @@ static void udp_send(bl_host_t *h) {
 }
 
 static void udp_close(bl_host_t *h) {
-	closesocket(h->fd);
+	close(h->fd);
 }
 
 #define NO_BLS 3
diff --git a/libvo/vo_fbdev.c b/libvo/vo_fbdev.c
index abe5d9aeeb..e8f5e86ba7 100644
--- a/libvo/vo_fbdev.c
+++ b/libvo/vo_fbdev.c
@@ -25,6 +25,7 @@
 #include "video_out_internal.h"
 #include "fastmemcpy.h"
 #include "sub.h"
+#include "geometry.h"
 #ifdef CONFIG_VIDIX
 #include "vosub_vidix.h"
 #endif
@@ -999,6 +1000,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
 #endif
 	{
 	    int x_offset=0,y_offset=0;
+	    geometry(&x_offset, &y_offset, &out_width, &out_height, fb_xres, fb_yres);
 	    if ((frame_buffer = (uint8_t *) mmap(0, fb_size, PROT_READ | PROT_WRITE,
 				    MAP_SHARED, fb_dev_fd, 0)) == (uint8_t *) -1) {
 		mp_msg(MSGT_VO, MSGL_ERR, "Can't mmap %s: %s\n", fb_dev_name, strerror(errno));
diff --git a/libvo/vo_mpegpes.c b/libvo/vo_mpegpes.c
index ec67bceee5..3971abdb69 100644
--- a/libvo/vo_mpegpes.c
+++ b/libvo/vo_mpegpes.c
@@ -24,9 +24,9 @@
 
 #include "mp_msg.h"
 
-#ifdef HAVE_DVB
-#ifndef HAVE_DVB_HEAD
-#include <sys/poll.h>
+#ifdef CONFIG_DVB
+#ifndef CONFIG_DVB_HEAD
+#include <poll.h>
 
 #include <sys/ioctl.h>
 #include <stdio.h>
@@ -41,7 +41,7 @@
 #else
 #define true 1
 #define false 0
-#include <sys/poll.h>
+#include <poll.h>
 
 #include <sys/ioctl.h>
 #include <stdio.h>
@@ -64,7 +64,7 @@ extern int vo_mpegpes_fd2;
 
 static const vo_info_t info = 
 {
-#ifdef HAVE_DVB
+#ifdef CONFIG_DVB
 	"MPEG-PES to DVB card",
 #else
 	"MPEG-PES file",
@@ -79,7 +79,7 @@ const LIBVO_EXTERN (mpegpes)
 static int
 config(uint32_t s_width, uint32_t s_height, uint32_t width, uint32_t height, uint32_t flags, char *title, uint32_t format)
 {
-#ifdef HAVE_DVB
+#ifdef CONFIG_DVB
     switch(s_height){
     case 288:
     case 576:
@@ -95,7 +95,7 @@ config(uint32_t s_width, uint32_t s_height, uint32_t width, uint32_t height, uin
 }
 
 static int preinit(const char *arg){
-#ifdef HAVE_DVB
+#ifdef CONFIG_DVB
     int card = -1;
     char vo_file[30], ao_file[30], *tmp;
     
@@ -128,7 +128,7 @@ static int preinit(const char *arg){
           mp_msg(MSGT_VO,MSGL_INFO, "Couldn't find a usable dvb video device, exiting\n");
           return -1;
         }
-#ifndef HAVE_DVB_HEAD
+#ifndef CONFIG_DVB_HEAD
 	mp_msg(MSGT_VO,MSGL_INFO, "Opening /dev/ost/video+audio\n");
 	sprintf(vo_file, "/dev/ost/video");
 	sprintf(ao_file, "/dev/ost/audio");
@@ -174,7 +174,7 @@ static void draw_osd(void)
 
 static int my_write(const unsigned char* data,int len){
     int orig_len = len;
-#ifdef HAVE_DVB
+#ifdef CONFIG_DVB
 #define NFD   2
     struct pollfd pfd[NFD];
 
diff --git a/loader/win32.c b/loader/win32.c
index 29e7348616..13f880c137 100644
--- a/loader/win32.c
+++ b/loader/win32.c
@@ -75,19 +75,6 @@ for DLL to know too much about its environment.
 #endif
 #include "osdep/mmap_anon.h"
 
-#ifndef HAVE_VSSCANF
-/* system has no vsscanf.  try to provide one */
-static int vsscanf( const char *str, const char *format, va_list ap)
-{
-    long p1 = va_arg(ap, long);
-    long p2 = va_arg(ap, long);
-    long p3 = va_arg(ap, long);
-    long p4 = va_arg(ap, long);
-    long p5 = va_arg(ap, long);
-    return sscanf(str, format, p1, p2, p3, p4, p5);
-}
-#endif
-
 char* def_path = WIN32_PATH;
 
 static void do_cpuid(unsigned int ax, unsigned int *regs)
diff --git a/stream/asf_mmst_streaming.c b/stream/asf_mmst_streaming.c
index aaf43ff49a..ad9b3e97ee 100644
--- a/stream/asf_mmst_streaming.c
+++ b/stream/asf_mmst_streaming.c
@@ -39,9 +39,7 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#ifndef HAVE_WINSOCK2
-#define closesocket close
-#else
+#ifdef HAVE_WINSOCK2_H
 #include <winsock2.h>
 #endif
 
diff --git a/stream/asf_streaming.c b/stream/asf_streaming.c
index 1082ec374a..98859cfe9e 100644
--- a/stream/asf_streaming.c
+++ b/stream/asf_streaming.c
@@ -10,9 +10,7 @@
 #include "help_mp.h"
 #include "options.h"
 
-#ifndef HAVE_WINSOCK2
-#define closesocket close
-#else
+#ifdef HAVE_WINSOCK2_H
 #include <winsock2.h>
 #endif
 
diff --git a/stream/dvb_tune.c b/stream/dvb_tune.c
index 2235541fe1..64a2b0fb0a 100644
--- a/stream/dvb_tune.c
+++ b/stream/dvb_tune.c
@@ -27,7 +27,7 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include <sys/ioctl.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <time.h>
diff --git a/stream/http.c b/stream/http.c
index 3af0d47c4d..2a6d07aee0 100644
--- a/stream/http.c
+++ b/stream/http.c
@@ -11,8 +11,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#ifndef HAVE_WINSOCK2
-#define closesocket close
+#ifndef HAVE_WINSOCK2_H
 #else
 #include <winsock2.h>
 #include <ws2tcpip.h>
diff --git a/stream/librtsp/rtsp.c b/stream/librtsp/rtsp.c
index 89a3b47584..19477fe5b3 100644
--- a/stream/librtsp/rtsp.c
+++ b/stream/librtsp/rtsp.c
@@ -42,7 +42,7 @@
 #include <sys/time.h>
 #include <sys/types.h>
 #include <inttypes.h>
-#ifdef HAVE_WINSOCK2
+#ifdef HAVE_WINSOCK2_H
 #include <winsock2.h>
 #else
 #include <sys/socket.h>
@@ -72,7 +72,7 @@ static int write_stream(int s, const char *buf, int len) {
     if (n > 0)
       total += n;
     else if (n < 0) {
-#ifndef HAVE_WINSOCK2
+#ifndef HAVE_WINSOCK2_H
       if ((timeout>0) && ((errno == EAGAIN) || (errno == EINPROGRESS))) {
 #else
       if ((timeout>0) && ((errno == EAGAIN) || (WSAGetLastError() == WSAEINPROGRESS))) {
diff --git a/stream/librtsp/rtsp_rtp.c b/stream/librtsp/rtsp_rtp.c
index b582b1a700..fd01524d89 100644
--- a/stream/librtsp/rtsp_rtp.c
+++ b/stream/librtsp/rtsp_rtp.c
@@ -28,7 +28,7 @@
 
 #include "config.h"
 
-#ifndef HAVE_WINSOCK2
+#ifndef HAVE_WINSOCK2_H
 #include <netdb.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
@@ -42,8 +42,8 @@
 #include "rtsp.h"
 #include "rtsp_rtp.h"
 #include "rtsp_session.h"
-#include "../freesdp/common.h"
-#include "../freesdp/parser.h"
+#include "stream/freesdp/common.h"
+#include "stream/freesdp/parser.h"
 
 #define RTSP_DEFAULT_PORT 31336
 #define MAX_LENGTH 256
@@ -250,7 +250,7 @@ rtcp_connect (int client_port, int server_port, const char* server_hostname)
   
   if (bind (s, (struct sockaddr *) &sin, sizeof (sin)))
   {
-#ifndef HAVE_WINSOCK2
+#ifndef HAVE_WINSOCK2_H
     if (errno != EINPROGRESS)
 #else
     if (WSAGetLastError() != WSAEINPROGRESS)
@@ -296,7 +296,7 @@ rtp_connect (char *hostname, int port)
   if (!hostname || !strcmp (hostname, "0.0.0.0"))
     sin.sin_addr.s_addr = htonl (INADDR_ANY);
   else
-#ifndef HAVE_WINSOCK2
+#ifndef HAVE_WINSOCK2_H
 #ifdef HAVE_ATON
     inet_aton (hostname, &sin.sin_addr);
 #else
@@ -331,7 +331,7 @@ rtp_connect (char *hostname, int port)
   /* datagram socket */
   if (bind (s, (struct sockaddr *) &sin, sizeof (sin)))
   {
-#ifndef HAVE_WINSOCK2
+#ifndef HAVE_WINSOCK2_H
     if (errno != EINPROGRESS)
 #else
     if (WSAGetLastError() != WSAEINPROGRESS)
@@ -385,7 +385,7 @@ is_multicast_address (char *addr)
   
   sin.sin_family = AF_INET;
 
-#ifndef HAVE_WINSOCK2
+#ifndef HAVE_WINSOCK2_H
 #ifdef HAVE_ATON
     inet_aton (addr, &sin.sin_addr);
 #else
diff --git a/stream/librtsp/rtsp_session.c b/stream/librtsp/rtsp_session.c
index d999323fcd..ce68dd765f 100644
--- a/stream/librtsp/rtsp_session.c
+++ b/stream/librtsp/rtsp_session.c
@@ -30,8 +30,7 @@
 
 #include <sys/types.h>
 #include "config.h"
-#ifndef HAVE_WINSOCK2
-#define closesocket close
+#ifndef HAVE_WINSOCK2_H
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netdb.h>
@@ -48,15 +47,16 @@
 #include <inttypes.h>
 
 #include "mp_msg.h"
-#include "../url.h"
-#include "../rtp.h"
 #include "rtsp.h"
 #include "rtsp_rtp.h"
 #include "rtsp_session.h"
-#include "../realrtsp/real.h"
-#include "../realrtsp/rmff.h"
-#include "../realrtsp/asmrp.h"
-#include "../realrtsp/xbuffer.h"
+#include "stream/network.h"
+#include "stream/url.h"
+#include "stream/rtp.h"
+#include "stream/realrtsp/real.h"
+#include "stream/realrtsp/rmff.h"
+#include "stream/realrtsp/asmrp.h"
+#include "stream/realrtsp/xbuffer.h"
 
 /*
 #define LOG
diff --git a/stream/netstream.h b/stream/netstream.h
index 4d61b01967..533e6a3b93 100644
--- a/stream/netstream.h
+++ b/stream/netstream.h
@@ -14,7 +14,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#ifndef HAVE_WINSOCK2
+#ifndef HAVE_WINSOCK2_H
 #include <sys/socket.h>
 #endif
 #include "mp_msg.h"
diff --git a/stream/network.c b/stream/network.c
index 34f3905734..6e000c07f2 100644
--- a/stream/network.c
+++ b/stream/network.c
@@ -19,9 +19,7 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#ifndef HAVE_WINSOCK2
-#define closesocket close
-#else
+#ifdef HAVE_WINSOCK2_H
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #endif
diff --git a/stream/network.h b/stream/network.h
index 2d3b96166e..1f06a5ca14 100644
--- a/stream/network.h
+++ b/stream/network.h
@@ -12,7 +12,7 @@
 #include <sys/types.h>
 
 #include "config.h"
-#ifndef HAVE_WINSOCK2
+#ifndef HAVE_WINSOCK2_H
 #include <netdb.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
@@ -22,6 +22,10 @@
 #include "url.h"
 #include "http.h"
 
+#ifndef HAVE_CLOSESOCKET
+#define closesocket close
+#endif
+
 #define BUFFER_SIZE		2048
 
 typedef struct {
diff --git a/stream/pnm.c b/stream/pnm.c
index deb3ee8b4c..1ef86e620c 100644
--- a/stream/pnm.c
+++ b/stream/pnm.c
@@ -35,8 +35,7 @@
 #include <stdlib.h>
 #include <sys/time.h>
 #include <inttypes.h>
-#ifndef HAVE_WINSOCK2
-#define closesocket close
+#ifndef HAVE_WINSOCK2_H
 #include <sys/socket.h>
 //#include <netinet/in.h>
 //#include <netdb.h>
@@ -50,7 +49,7 @@
 #include "libmpdemux/demuxer.h"
 #include "help_mp.h"
 #include "osdep/timer.h"
-
+#include "network.h"
 #include "pnm.h"
 #include "tcp.h"
 //#include "libreal/rmff.h"
@@ -205,7 +204,7 @@ static int rm_write(int s, const char *buf, int len) {
     if (n > 0)
       total += n;
     else if (n < 0) {
-#ifndef HAVE_WINSOCK2
+#ifndef HAVE_WINSOCK2_H
       if (timeout>0 && (errno == EAGAIN || errno == EINPROGRESS)) {
 #else
       if (timeout>0 && (errno == EAGAIN || WSAGetLastError() == WSAEINPROGRESS)) {
diff --git a/stream/realrtsp/real.c b/stream/realrtsp/real.c
index 62670f4726..6a7ef4e47b 100644
--- a/stream/realrtsp/real.c
+++ b/stream/realrtsp/real.c
@@ -38,7 +38,7 @@
 #include "xbuffer.h"
 #include "libavutil/md5.h"
 #include "libavutil/intreadwrite.h"
-#include "../http.h"
+#include "stream/http.h"
 #include "mp_msg.h"
 
 /*
diff --git a/stream/realrtsp/real.h b/stream/realrtsp/real.h
index 37ac03b28e..0569a3db74 100644
--- a/stream/realrtsp/real.h
+++ b/stream/realrtsp/real.h
@@ -31,7 +31,7 @@
 #define MPLAYER_REAL_H
 
 #include "rmff.h"
-#include "../librtsp/rtsp.h"
+#include "stream/librtsp/rtsp.h"
 
 #define HEADER_SIZE 4096
 
diff --git a/stream/realrtsp/rmff.h b/stream/realrtsp/rmff.h
index 639b8522bb..a58bb3ccdc 100644
--- a/stream/realrtsp/rmff.h
+++ b/stream/realrtsp/rmff.h
@@ -31,7 +31,7 @@
 
 #include <sys/types.h>
 #include "config.h"
-#ifndef HAVE_WINSOCK2
+#ifndef HAVE_WINSOCK2_H
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netdb.h>
diff --git a/stream/realrtsp/sdpplin.c b/stream/realrtsp/sdpplin.c
index 31514befeb..80dc49edaa 100644
--- a/stream/realrtsp/sdpplin.c
+++ b/stream/realrtsp/sdpplin.c
@@ -27,7 +27,7 @@
  */
  
 #include "config.h"
-#include "../librtsp/rtsp.h"
+#include "stream/librtsp/rtsp.h"
 #include "sdpplin.h"
 #include "xbuffer.h"
 #include "mp_msg.h"
diff --git a/stream/realrtsp/sdpplin.h b/stream/realrtsp/sdpplin.h
index ff79c49775..658aeaf0ed 100644
--- a/stream/realrtsp/sdpplin.h
+++ b/stream/realrtsp/sdpplin.h
@@ -30,7 +30,7 @@
 #define MPLAYER_SDPPLIN_H
 
 #include "rmff.h"
-#include "../librtsp/rtsp.h"
+#include "stream/librtsp/rtsp.h"
 
 typedef struct {
 
diff --git a/stream/rtp.c b/stream/rtp.c
index 1c31bef4a1..624812a0fe 100644
--- a/stream/rtp.c
+++ b/stream/rtp.c
@@ -13,16 +13,16 @@
 #include <sys/types.h>
 #include <ctype.h>
 #include "config.h"
-#ifndef HAVE_WINSOCK2
+#ifndef HAVE_WINSOCK2_H
 #include <netinet/in.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
-#define closesocket close
 #else
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #endif
 #include <errno.h>
+#include "network.h"
 #include "stream.h"
 
 /* MPEG-2 TS RTP stack */
diff --git a/stream/stream.c b/stream/stream.c
index 47d55be71f..1431fa123a 100644
--- a/stream/stream.c
+++ b/stream/stream.c
@@ -14,16 +14,14 @@
 
 #include "config.h"
 
-#ifndef HAVE_WINSOCK2
-#define closesocket close
-#else
+#ifdef HAVE_WINSOCK2_H
 #include <winsock2.h>
 #endif
 
 #include "mp_msg.h"
 #include "help_mp.h"
 #include "osdep/shmem.h"
-
+#include "network.h"
 #include "stream.h"
 #include "libmpdemux/demuxer.h"
 
@@ -408,7 +406,7 @@ stream_t* new_stream(int fd,int type){
   if(s==NULL) return NULL;
   memset(s,0,sizeof(stream_t));
 
-#ifdef HAVE_WINSOCK2
+#ifdef HAVE_WINSOCK2_H
   {
     WSADATA wsdata;
     int temp = WSAStartup(0x0202, &wsdata); // there might be a better place for this (-> later)
@@ -443,7 +441,7 @@ void free_stream(stream_t *s){
       closesocket(s->fd);
     else close(s->fd);
   }
-#ifdef HAVE_WINSOCK2
+#ifdef HAVE_WINSOCK2_H
   mp_msg(MSGT_STREAM,MSGL_V,"WINSOCK2 uninit\n");
   WSACleanup(); // there might be a better place for this (-> later)
 #endif
diff --git a/stream/stream_cddb.c b/stream/stream_cddb.c
index ff12d94c17..5236a4ca9c 100644
--- a/stream/stream_cddb.c
+++ b/stream/stream_cddb.c
@@ -27,7 +27,7 @@
 #define mkdir(a,b) mkdir(a)
 #endif
 #include <windows.h>
-#ifdef HAVE_WINSOCK2
+#ifdef HAVE_WINSOCK2_H
 #include <winsock2.h>
 #endif
 #else
diff --git a/stream/stream_dvb.c b/stream/stream_dvb.c
index 948bd70c81..5068fd0dbb 100644
--- a/stream/stream_dvb.c
+++ b/stream/stream_dvb.c
@@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 #include <ctype.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
diff --git a/stream/stream_dvd.c b/stream/stream_dvd.c
index 92b06c67bb..2c4d1b859a 100644
--- a/stream/stream_dvd.c
+++ b/stream/stream_dvd.c
@@ -860,6 +860,7 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) {
     }
     if (mp_msg_test(MSGT_IDENTIFY, MSGL_V))
     {
+      char volid[32];
       unsigned char discid [16]; ///< disk ID, a 128 bit MD5 sum
       int vts_no;   ///< video title set number
       for (vts_no = 1; vts_no <= vmg_file->vts_atrt->nr_of_vtss; vts_no++)
@@ -872,6 +873,8 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) {
           mp_msg(MSGT_IDENTIFY, MSGL_V, "%02X", discid[i]);
         mp_msg(MSGT_IDENTIFY, MSGL_V, "\n");
       }
+      if (DVDUDFVolumeInfo(dvd, volid, sizeof(volid), NULL, 0) >= 0)
+        mp_msg(MSGT_IDENTIFY, MSGL_V, "ID_DVD_VOLUME_ID=%s\n", volid);
     }
     /**
      * Make sure our title number is valid.
diff --git a/stream/stream_dvd.h b/stream/stream_dvd.h
index 3532646dbb..9196ef04e0 100644
--- a/stream/stream_dvd.h
+++ b/stream/stream_dvd.h
@@ -4,15 +4,15 @@
 #include "config.h"
 #include <stdint.h>
 #ifdef CONFIG_DVDREAD_INTERNAL
-#include "dvdread/dvd_reader.h"
-#include "dvdread/ifo_types.h"
-#include "dvdread/ifo_read.h"
-#include "dvdread/nav_read.h"
+#include "libdvdread/dvd_reader.h"
+#include "libdvdread/ifo_types.h"
+#include "libdvdread/ifo_read.h"
+#include "libdvdread/nav_read.h"
 #else
-#include <libdvdread/dvd_reader.h>
-#include <libdvdread/ifo_types.h>
-#include <libdvdread/ifo_read.h>
-#include <libdvdread/nav_read.h>
+#include <dvdread/dvd_reader.h>
+#include <dvdread/ifo_types.h>
+#include <dvdread/ifo_read.h>
+#include <dvdread/nav_read.h>
 #endif
 #include "stream.h"
 
diff --git a/stream/stream_dvd_common.c b/stream/stream_dvd_common.c
index ffaf1d490c..e2cf3690ba 100644
--- a/stream/stream_dvd_common.c
+++ b/stream/stream_dvd_common.c
@@ -1,9 +1,9 @@
 #include "config.h"
 #include <inttypes.h>
 #ifdef CONFIG_DVDREAD_INTERNAL
-#include <dvdread/ifo_types.h>
+#include "libdvdread/ifo_types.h"
 #else
-#include <libdvdread/ifo_types.h>
+#include <dvdread/ifo_types.h>
 #endif
 #include "stream_dvd_common.h"
 
diff --git a/stream/stream_dvd_common.h b/stream/stream_dvd_common.h
index 5d7953571d..c79492e061 100644
--- a/stream/stream_dvd_common.h
+++ b/stream/stream_dvd_common.h
@@ -4,9 +4,9 @@
 #include "config.h"
 #include <inttypes.h>
 #ifdef CONFIG_DVDREAD_INTERNAL
-#include <dvdread/ifo_types.h>
+#include "libdvdread/ifo_types.h"
 #else
-#include <libdvdread/ifo_types.h>
+#include <dvdread/ifo_types.h>
 #endif
 
 int mp_dvdtimetomsec(dvd_time_t *dt);
diff --git a/stream/stream_ftp.c b/stream/stream_ftp.c
index 091fc4e35c..95632e7375 100644
--- a/stream/stream_ftp.c
+++ b/stream/stream_ftp.c
@@ -9,14 +9,14 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
-#ifndef HAVE_WINSOCK2
+#ifndef HAVE_WINSOCK2_H
 #include <sys/socket.h>
-#define closesocket close
 #else
 #include <winsock2.h>
 #endif
 
 #include "mp_msg.h"
+#include "network.h"
 #include "stream.h"
 #include "help_mp.h"
 #include "m_option.h"
diff --git a/stream/stream_netstream.c b/stream/stream_netstream.c
index a514a897c0..f9c70e72ba 100644
--- a/stream/stream_netstream.c
+++ b/stream/stream_netstream.c
@@ -42,8 +42,7 @@
 #include <inttypes.h>
 #include <errno.h>
 
-#ifndef HAVE_WINSOCK2
-#define closesocket close
+#ifndef HAVE_WINSOCK2_H
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -59,6 +58,7 @@
 #include "libavutil/common.h"
 #include "mpbswap.h"
 
+#include "network.h"
 #include "netstream.h"
 #include "tcp.h"
 
@@ -90,7 +90,7 @@ static const struct m_struct_st stream_opts = {
 //// When the cache is running we need a lock as
 //// fill_buffer is called from another proccess
 static int lock_fd(int fd) {
-#ifndef HAVE_WINSOCK2
+#ifndef HAVE_WINSOCK2_H
   struct flock lock;
 
   memset(&lock,0,sizeof(struct flock));
@@ -113,7 +113,7 @@ printf("FIXME? should lock here\n");
 }
 
 static int unlock_fd(int fd) {
-#ifndef HAVE_WINSOCK2
+#ifndef HAVE_WINSOCK2_H
   struct flock lock;
 
   memset(&lock,0,sizeof(struct flock));
diff --git a/stream/stream_pvr.c b/stream/stream_pvr.c
index 562ce705b7..8cc0eef6a0 100644
--- a/stream/stream_pvr.c
+++ b/stream/stream_pvr.c
@@ -36,7 +36,7 @@
 #include <sys/ioctl.h>
 #include <sys/fcntl.h>
 #include <inttypes.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <linux/types.h>
 #include <linux/videodev2.h>
 
diff --git a/stream/stream_rtsp.c b/stream/stream_rtsp.c
index 616fbf7b55..1edc172549 100644
--- a/stream/stream_rtsp.c
+++ b/stream/stream_rtsp.c
@@ -28,17 +28,17 @@
 #include <sys/types.h>
 #include <ctype.h>
 #include "config.h"
-#ifndef HAVE_WINSOCK2
+#ifndef HAVE_WINSOCK2_H
 #include <netinet/in.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
-#define closesocket close
 #else
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #endif
 #include <errno.h>
 
+#include "network.h"
 #include "stream.h"
 #include "tcp.h"
 #include "librtsp/rtsp.h"
diff --git a/stream/tcp.c b/stream/tcp.c
index 950c434886..fd5a849cad 100644
--- a/stream/tcp.c
+++ b/stream/tcp.c
@@ -20,17 +20,17 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#ifndef HAVE_WINSOCK2
+#ifndef HAVE_WINSOCK2_H
 #include <netdb.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
-#define closesocket close
 #else
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #endif
 
+#include "network.h"
 #include "stream.h"
 #include "tcp.h"
 
@@ -75,7 +75,7 @@ connect2Server_with_af(char *host, int port, int af,int verb) {
 	struct hostent *hp=NULL;
 	char buf[255];
 	
-#ifdef HAVE_WINSOCK2
+#ifdef HAVE_WINSOCK2_H
 	u_long val;
 	int to;
 #else
@@ -91,7 +91,7 @@ connect2Server_with_af(char *host, int port, int af,int verb) {
 	}
 
 #if defined(SO_RCVTIMEO) && defined(SO_SNDTIMEO)
-#ifdef HAVE_WINSOCK2
+#ifdef HAVE_WINSOCK2_H
 	/* timeout in milliseconds */
 	to = 10 * 1000;
 #else
@@ -115,7 +115,7 @@ connect2Server_with_af(char *host, int port, int af,int verb) {
 	
 	memset(&server_address, 0, sizeof(server_address));
 	
-#ifndef HAVE_WINSOCK2
+#ifndef HAVE_WINSOCK2_H
 #ifdef HAVE_ATON
 	if (inet_aton(host, our_s_addr)!=1)
 #else
@@ -139,7 +139,7 @@ connect2Server_with_af(char *host, int port, int af,int verb) {
 		
 		memcpy( our_s_addr, (void*)hp->h_addr_list[0], hp->h_length );
 	}
-#ifdef HAVE_WINSOCK2
+#ifdef HAVE_WINSOCK2_H
 	else {
 		unsigned long addr = inet_addr(host);
 		memcpy( our_s_addr, (void*)&addr, sizeof(addr) );
@@ -164,7 +164,7 @@ connect2Server_with_af(char *host, int port, int af,int verb) {
 			return TCP_ERROR_FATAL;
 	}
 
-#if defined(HAVE_ATON) || defined(HAVE_WINSOCK2)
+#if defined(HAVE_ATON) || defined(HAVE_WINSOCK2_H)
 	strncpy( buf, inet_ntoa( *((struct in_addr*)our_s_addr) ), 255);
 #else
 	inet_ntop(af, our_s_addr, buf, 255);
@@ -172,14 +172,14 @@ connect2Server_with_af(char *host, int port, int af,int verb) {
 	if(verb) mp_msg(MSGT_NETWORK,MSGL_STATUS,MSGTR_MPDEMUX_NW_ConnectingToServer, host, buf , port );
 
 	// Turn the socket as non blocking so we can timeout on the connection
-#ifndef HAVE_WINSOCK2
+#ifndef HAVE_WINSOCK2_H
 	fcntl( socket_server_fd, F_SETFL, fcntl(socket_server_fd, F_GETFL) | O_NONBLOCK );
 #else
 	val = 1;
 	ioctlsocket( socket_server_fd, FIONBIO, &val );
 #endif
 	if( connect( socket_server_fd, (struct sockaddr*)&server_address, server_address_size )==-1 ) {
-#ifndef HAVE_WINSOCK2
+#ifndef HAVE_WINSOCK2_H
 		if( errno!=EINPROGRESS ) {
 #else
 		if( (WSAGetLastError() != WSAEINPROGRESS) && (WSAGetLastError() != WSAEWOULDBLOCK) ) {
@@ -211,7 +211,7 @@ connect2Server_with_af(char *host, int port, int af,int verb) {
 	if (ret < 0) mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_NW_SelectFailed);
 
 	// Turn back the socket as blocking
-#ifndef HAVE_WINSOCK2
+#ifndef HAVE_WINSOCK2_H
 	fcntl( socket_server_fd, F_SETFL, fcntl(socket_server_fd, F_GETFL) & ~O_NONBLOCK );
 #else
 	val = 0;
diff --git a/stream/tvi_v4l2.c b/stream/tvi_v4l2.c
index fc23727f9f..7a15a9b0be 100644
--- a/stream/tvi_v4l2.c
+++ b/stream/tvi_v4l2.c
@@ -35,6 +35,7 @@ known issues:
 #include <sys/time.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <math.h>
 #ifdef HAVE_SYS_SYSINFO_H
 #include <sys/sysinfo.h>
 #endif
diff --git a/stream/udp.c b/stream/udp.c
index 759c5a9675..e7ac97f597 100644
--- a/stream/udp.c
+++ b/stream/udp.c
@@ -31,18 +31,18 @@
 #include <sys/time.h>
 #include <ctype.h>
 
-#ifndef HAVE_WINSOCK2
+#ifndef HAVE_WINSOCK2_H
 #include <netdb.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
-#define closesocket close
 #else
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #endif
 
 #include "mp_msg.h"
+#include "network.h"
 #include "url.h"
 #include "udp.h"
 
@@ -74,7 +74,7 @@ udp_open_socket (URL_t *url)
 
   if (isalpha (url->hostname[0]))
   {
-#ifndef HAVE_WINSOCK2
+#ifndef HAVE_WINSOCK2_H
     hp = (struct hostent *) gethostbyname (url->hostname);
     if (!hp)
     {
@@ -87,11 +87,11 @@ udp_open_socket (URL_t *url)
             (void *) hp->h_addr_list[0], hp->h_length);
 #else
     server_address.sin_addr.s_addr = htonl (INADDR_ANY);
-#endif /* HAVE_WINSOCK2 */
+#endif /* HAVE_WINSOCK2_H */
   }
   else
   {
-#ifndef HAVE_WINSOCK2
+#ifndef HAVE_WINSOCK2_H
 #ifdef HAVE_ATON
     inet_aton (url->hostname, &server_address.sin_addr);
 #else
@@ -99,7 +99,7 @@ udp_open_socket (URL_t *url)
 #endif /* HAVE_ATON */
 #else
     server_address.sin_addr.s_addr = htonl(INADDR_ANY);
-#endif /* HAVE_WINSOCK2 */
+#endif /* HAVE_WINSOCK2_H */
   }
   server_address.sin_family = AF_INET;
   server_address.sin_port = htons (url->port);
@@ -110,11 +110,11 @@ udp_open_socket (URL_t *url)
   if (bind (socket_server_fd, (struct sockaddr *) &server_address,
             sizeof (server_address)) == -1)
   {
-#ifndef HAVE_WINSOCK2
+#ifndef HAVE_WINSOCK2_H
     if (errno != EINPROGRESS)
 #else
     if (WSAGetLastError () != WSAEINPROGRESS)
-#endif /* HAVE_WINSOCK2 */
+#endif /* HAVE_WINSOCK2_H */
     {
       mp_msg (MSGT_NETWORK, MSGL_ERR, "Failed to connect to server\n");
       closesocket (socket_server_fd);
@@ -122,7 +122,7 @@ udp_open_socket (URL_t *url)
     }
   }
 	
-#ifdef HAVE_WINSOCK2
+#ifdef HAVE_WINSOCK2_H
   if (isalpha (url->hostname[0]))
   {
     hp = (struct hostent *) gethostbyname (url->hostname);
@@ -141,7 +141,7 @@ udp_open_socket (URL_t *url)
     unsigned int addr = inet_addr (url->hostname);
     memcpy ((void *) &server_address.sin_addr, (void *) &addr, sizeof (addr));
   }
-#endif /* HAVE_WINSOCK2 */
+#endif /* HAVE_WINSOCK2_H */
 
   /* Increase the socket rx buffer size to maximum -- this is UDP */
   rxsockbufsz = 240 * 1024;
diff --git a/vobsub.c b/vobsub.c
index 09087d0923..de19bbfc3b 100644
--- a/vobsub.c
+++ b/vobsub.c
@@ -803,8 +803,8 @@ vobsub_parse_origin(vobsub_t *vob, const char *line)
 unsigned int vobsub_palette_to_yuv(unsigned int pal)
 {
     int r, g, b, y, u, v;
-    // Palette in idx file is not rgb value, it was calculated by wrong forumla.
-    // Here's reversed forumla of the one used to generate palette in idx file.
+    // Palette in idx file is not rgb value, it was calculated by wrong formula.
+    // Here's reversed formula of the one used to generate palette in idx file.
     r = pal >> 16 & 0xff;
     g = pal >> 8 & 0xff;
     b = pal & 0xff;