Merge removal of unneeded libdts and liba52

Conflicts:
	.gitignore
	XBMC.xcodeproj/project.pbxproj
	configure.in
	lib/Makefile.in
	project/VS2010Express/XBMC.vcxproj
	project/VS2010Express/XBMC.vcxproj.filters
	tools/Linux/packaging/debian/copyright
	xbmc/DllPaths_win32.h
	xbmc/cores/dvdplayer/DVDCodecs/Audio/Makefile.in

diff --cc .gitignore
index 54b4b01,f662117..768eb60
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -643,47 -594,44 +601,6 @@@ config.lo
  /lib/libdvd/libdvdread/autom4te.cache
  /lib/libdvd/libdvdread/config.h.in~
  
- # /lib/libdts/
- /lib/libdts/config.log
- /lib/libdts/config.h
- /lib/libdts/Makefile
- /lib/libdts/config.status
- /lib/libdts/stamp-h1
- /lib/libdts/configure.lineno
- 
- # /lib/libdts/autotools/
- /lib/libdts/autotools/Makefile
 -# /lib/libfaad2/
 -/lib/libfaad2/config.log
 -/lib/libfaad2/config.h
 -/lib/libfaad2/Makefile
 -/lib/libfaad2/config.status
 -/lib/libfaad2/stamp-h1
 -/lib/libfaad2/configure.lineno
 -/lib/libfaad2/libtool
 -/lib/libfaad2/faad2.spec
 -/lib/libfaad2/libfaad/ReleaseDLL
--
- # /lib/libdts/debian/
- /lib/libdts/debian/Makefile
 -# /lib/libfaad2/common/
 -/lib/libfaad2/common/Makefile
--
- # /lib/libdts/doc/
- /lib/libdts/doc/Makefile
 -# /lib/libfaad2/common/mp4ff/
 -/lib/libfaad2/common/mp4ff/Makefile
--
- # /lib/libdts/include/
- /lib/libdts/include/Makefile
 -# /lib/libfaad2/frontend/
 -/lib/libfaad2/frontend/Makefile
 -/lib/libfaad2/frontend/faad
--
- # /lib/libdts/libao/
- /lib/libdts/libao/Makefile
 -# /lib/libfaad2/libfaad/
 -/lib/libfaad2/libfaad/Makefile
 -/lib/libfaad2/libfaad/DebugDLL
 -/lib/libfaad2/libfaad/ReleaseDLL
--
- # /lib/libdts/libdts/
- /lib/libdts/libdts/Makefile
 -# /lib/libfaad2/plugins/
 -/lib/libfaad2/plugins/Makefile
--
- # /lib/libdts/src/
- /lib/libdts/src/extract_dts
- /lib/libdts/src/dtsdec
- /lib/libdts/src/Makefile
 -# /lib/libfaad2/plugins/mpeg4ip/
 -/lib/libfaad2/plugins/mpeg4ip/Makefile
--
- # /lib/libdts/test/
- /lib/libdts/test/compare
- /lib/libdts/test/Makefile
 -# /lib/libfaad2/plugins/xmms/
 -/lib/libfaad2/plugins/xmms/Makefile
--
- # /lib/libdts/vc++/
- /lib/libdts/vc++/Makefile
- /lib/libdts/vc++/libdts.lib
- /lib/libdts/vc++/Debug
- /lib/libdts/vc++/Release
 -# /lib/libfaad2/plugins/xmms/src/
 -/lib/libfaad2/plugins/xmms/src/Makefile
--
  # /lib/libmad/
  /lib/libmad/config.h
  /lib/libmad/Makefile

diff --cc Makefile.in
index 35622b9,ab85900..23b2fa4
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -454,11 -452,8 +449,8 @@@ libhdhomerun: dllloade
  libid3tag: dllloader
        $(MAKE) -C lib/libid3tag
  papcodecs: dllloader dvdpcodecs
- ifeq (@USE_INTERNAL_LIBA52@,1)
-       $(MAKE) -C xbmc/cores/paplayer/AC3Codec
- endif
        $(MAKE) -C lib/xbadpcm
 -ifeq ($(findstring osx,$(ARCH)), osx)
 +ifeq ($(findstring osx,@ARCH@), osx)
        $(MAKE) -C lib/libflac
  endif
        $(MAKE) -C lib/vgmstream

diff --cc XBMC.xcodeproj/project.pbxproj
index adca658,63cd8bb..5cbd530
--- 1/XBMC.xcodeproj/project.pbxproj
--- 2/XBMC.xcodeproj/project.pbxproj
+++ b/XBMC.xcodeproj/project.pbxproj
@@@ -625,11 -622,9 +625,8 @@@
                E38E1F790D25F9FD00618676 /* DVDAudio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14FC0D25F9F900618676 /* DVDAudio.cpp */; };
                E38E1F7A0D25F9FD00618676 /* DVDClock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14FE0D25F9F900618676 /* DVDClock.cpp */; };
                E38E1F7B0D25F9FD00618676 /* DVDAudioCodecFFmpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15070D25F9F900618676 /* DVDAudioCodecFFmpeg.cpp */; };
-               E38E1F7C0D25F9FD00618676 /* DVDAudioCodecLiba52.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15090D25F9F900618676 /* DVDAudioCodecLiba52.cpp */; };
-               E38E1F7D0D25F9FD00618676 /* DVDAudioCodecLibDts.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E150B0D25F9F900618676 /* DVDAudioCodecLibDts.cpp */; };
 -              E38E1F7E0D25F9FD00618676 /* DVDAudioCodecLibFaad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E150D0D25F9F900618676 /* DVDAudioCodecLibFaad.cpp */; };
                E38E1F7F0D25F9FD00618676 /* DVDAudioCodecLibMad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E150F0D25F9F900618676 /* DVDAudioCodecLibMad.cpp */; };
                E38E1F800D25F9FD00618676 /* DVDAudioCodecLPcm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15110D25F9F900618676 /* DVDAudioCodecLPcm.cpp */; };
-               E38E1F810D25F9FD00618676 /* DVDAudioCodecPassthrough.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15130D25F9F900618676 /* DVDAudioCodecPassthrough.cpp */; };
                E38E1F820D25F9FD00618676 /* DVDAudioCodecPcm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15150D25F9F900618676 /* DVDAudioCodecPcm.cpp */; };
                E38E1F840D25F9FD00618676 /* DVDCodecUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15220D25F9F900618676 /* DVDCodecUtils.cpp */; };
                E38E1F850D25F9FD00618676 /* DVDFactoryCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15240D25F9F900618676 /* DVDFactoryCodec.cpp */; };
@@@ -1222,11 -1212,9 +1217,8 @@@
                F5A1C8E70F6B06CF00A96ABD /* DVDAudio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14FC0D25F9F900618676 /* DVDAudio.cpp */; };
                F5A1C8E80F6B06CF00A96ABD /* DVDClock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14FE0D25F9F900618676 /* DVDClock.cpp */; };
                F5A1C8E90F6B06CF00A96ABD /* DVDAudioCodecFFmpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15070D25F9F900618676 /* DVDAudioCodecFFmpeg.cpp */; };
-               F5A1C8EA0F6B06CF00A96ABD /* DVDAudioCodecLiba52.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15090D25F9F900618676 /* DVDAudioCodecLiba52.cpp */; };
-               F5A1C8EB0F6B06CF00A96ABD /* DVDAudioCodecLibDts.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E150B0D25F9F900618676 /* DVDAudioCodecLibDts.cpp */; };
 -              F5A1C8EC0F6B06CF00A96ABD /* DVDAudioCodecLibFaad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E150D0D25F9F900618676 /* DVDAudioCodecLibFaad.cpp */; };
                F5A1C8ED0F6B06CF00A96ABD /* DVDAudioCodecLibMad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E150F0D25F9F900618676 /* DVDAudioCodecLibMad.cpp */; };
                F5A1C8EE0F6B06CF00A96ABD /* DVDAudioCodecLPcm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15110D25F9F900618676 /* DVDAudioCodecLPcm.cpp */; };
-               F5A1C8EF0F6B06CF00A96ABD /* DVDAudioCodecPassthrough.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15130D25F9F900618676 /* DVDAudioCodecPassthrough.cpp */; };
                F5A1C8F00F6B06CF00A96ABD /* DVDAudioCodecPcm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15150D25F9F900618676 /* DVDAudioCodecPcm.cpp */; };
                F5A1C8F10F6B06CF00A96ABD /* DVDCodecUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15220D25F9F900618676 /* DVDCodecUtils.cpp */; };
                F5A1C8F20F6B06CF00A96ABD /* DVDFactoryCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15240D25F9F900618676 /* DVDFactoryCodec.cpp */; };
@@@ -2612,16 -2591,13 +2598,10 @@@
                E38E14FD0D25F9F900618676 /* DVDAudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDAudio.h; sourceTree = "<group>"; };
                E38E14FE0D25F9F900618676 /* DVDClock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDClock.cpp; sourceTree = "<group>"; };
                E38E14FF0D25F9F900618676 /* DVDClock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDClock.h; sourceTree = "<group>"; };
-               E38E15020D25F9F900618676 /* DllLiba52.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DllLiba52.h; sourceTree = "<group>"; };
-               E38E15030D25F9F900618676 /* DllLibDts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DllLibDts.h; sourceTree = "<group>"; };
 -              E38E15040D25F9F900618676 /* DllLibFaad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DllLibFaad.h; sourceTree = "<group>"; };
                E38E15050D25F9F900618676 /* DllLibMad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DllLibMad.h; sourceTree = "<group>"; };
                E38E15060D25F9F900618676 /* DVDAudioCodec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDAudioCodec.h; sourceTree = "<group>"; };
                E38E15070D25F9F900618676 /* DVDAudioCodecFFmpeg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDAudioCodecFFmpeg.cpp; sourceTree = "<group>"; };
                E38E15080D25F9F900618676 /* DVDAudioCodecFFmpeg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDAudioCodecFFmpeg.h; sourceTree = "<group>"; };
-               E38E15090D25F9F900618676 /* DVDAudioCodecLiba52.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDAudioCodecLiba52.cpp; sourceTree = "<group>"; };
-               E38E150A0D25F9F900618676 /* DVDAudioCodecLiba52.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDAudioCodecLiba52.h; sourceTree = "<group>"; };
-               E38E150B0D25F9F900618676 /* DVDAudioCodecLibDts.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDAudioCodecLibDts.cpp; sourceTree = "<group>"; };
-               E38E150C0D25F9F900618676 /* DVDAudioCodecLibDts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDAudioCodecLibDts.h; sourceTree = "<group>"; };
 -              E38E150D0D25F9F900618676 /* DVDAudioCodecLibFaad.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDAudioCodecLibFaad.cpp; sourceTree = "<group>"; };
 -              E38E150E0D25F9F900618676 /* DVDAudioCodecLibFaad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDAudioCodecLibFaad.h; sourceTree = "<group>"; };
                E38E150F0D25F9F900618676 /* DVDAudioCodecLibMad.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDAudioCodecLibMad.cpp; sourceTree = "<group>"; };
                E38E15100D25F9F900618676 /* DVDAudioCodecLibMad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDAudioCodecLibMad.h; sourceTree = "<group>"; };
                E38E15110D25F9F900618676 /* DVDAudioCodecLPcm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDAudioCodecLPcm.cpp; sourceTree = "<group>"; };
@@@ -5288,16 -5248,13 +5254,10 @@@
                E38E15010D25F9F900618676 /* Audio */ = {
                        isa = PBXGroup;
                        children = (
-                               E38E15020D25F9F900618676 /* DllLiba52.h */,
-                               E38E15030D25F9F900618676 /* DllLibDts.h */,
 -                              E38E15040D25F9F900618676 /* DllLibFaad.h */,
                                E38E15050D25F9F900618676 /* DllLibMad.h */,
                                E38E15060D25F9F900618676 /* DVDAudioCodec.h */,
                                E38E15070D25F9F900618676 /* DVDAudioCodecFFmpeg.cpp */,
                                E38E15080D25F9F900618676 /* DVDAudioCodecFFmpeg.h */,
-                               E38E15090D25F9F900618676 /* DVDAudioCodecLiba52.cpp */,
-                               E38E150A0D25F9F900618676 /* DVDAudioCodecLiba52.h */,
-                               E38E150B0D25F9F900618676 /* DVDAudioCodecLibDts.cpp */,
-                               E38E150C0D25F9F900618676 /* DVDAudioCodecLibDts.h */,
 -                              E38E150D0D25F9F900618676 /* DVDAudioCodecLibFaad.cpp */,
 -                              E38E150E0D25F9F900618676 /* DVDAudioCodecLibFaad.h */,
                                E38E150F0D25F9F900618676 /* DVDAudioCodecLibMad.cpp */,
                                E38E15100D25F9F900618676 /* DVDAudioCodecLibMad.h */,
                                E38E15110D25F9F900618676 /* DVDAudioCodecLPcm.cpp */,
@@@ -5309,29 -5264,19 +5267,11 @@@
                                E38E15150D25F9F900618676 /* DVDAudioCodecPcm.cpp */,
                                E38E15160D25F9F900618676 /* DVDAudioCodecPcm.h */,
                                F5F24E801123242B009126C6 /* Encoders */,
-                               E38E15170D25F9F900618676 /* liba52 */,
-                               E38E15190D25F9F900618676 /* libdts */,
 -                              E38E151B0D25F9F900618676 /* libfaad */,
                                E38E151D0D25F9F900618676 /* libmad */,
                        );
                        path = Audio;
                        sourceTree = "<group>";
                };
-               E38E15170D25F9F900618676 /* liba52 */ = {
-                       isa = PBXGroup;
-                       children = (
-                               E38E15180D25F9F900618676 /* a52.h */,
-                       );
-                       path = liba52;
-                       sourceTree = "<group>";
-               };
-               E38E15190D25F9F900618676 /* libdts */ = {
 -              E38E151B0D25F9F900618676 /* libfaad */ = {
--                      isa = PBXGroup;
--                      children = (
-                               E38E151A0D25F9F900618676 /* dts.h */,
--                      );
-                       path = libdts;
 -                      path = libfaad;
--                      sourceTree = "<group>";
--              };
                E38E151D0D25F9F900618676 /* libmad */ = {
                        isa = PBXGroup;
                        children = (
@@@ -7343,11 -7271,9 +7273,8 @@@
                                E38E1F790D25F9FD00618676 /* DVDAudio.cpp in Sources */,
                                E38E1F7A0D25F9FD00618676 /* DVDClock.cpp in Sources */,
                                E38E1F7B0D25F9FD00618676 /* DVDAudioCodecFFmpeg.cpp in Sources */,
-                               E38E1F7C0D25F9FD00618676 /* DVDAudioCodecLiba52.cpp in Sources */,
-                               E38E1F7D0D25F9FD00618676 /* DVDAudioCodecLibDts.cpp in Sources */,
 -                              E38E1F7E0D25F9FD00618676 /* DVDAudioCodecLibFaad.cpp in Sources */,
                                E38E1F7F0D25F9FD00618676 /* DVDAudioCodecLibMad.cpp in Sources */,
                                E38E1F800D25F9FD00618676 /* DVDAudioCodecLPcm.cpp in Sources */,
-                               E38E1F810D25F9FD00618676 /* DVDAudioCodecPassthrough.cpp in Sources */,
                                E38E1F820D25F9FD00618676 /* DVDAudioCodecPcm.cpp in Sources */,
                                E38E1F840D25F9FD00618676 /* DVDCodecUtils.cpp in Sources */,
                                E38E1F850D25F9FD00618676 /* DVDFactoryCodec.cpp in Sources */,
@@@ -8224,11 -8143,9 +8147,8 @@@
                                F5A1C8E70F6B06CF00A96ABD /* DVDAudio.cpp in Sources */,
                                F5A1C8E80F6B06CF00A96ABD /* DVDClock.cpp in Sources */,
                                F5A1C8E90F6B06CF00A96ABD /* DVDAudioCodecFFmpeg.cpp in Sources */,
-                               F5A1C8EA0F6B06CF00A96ABD /* DVDAudioCodecLiba52.cpp in Sources */,
-                               F5A1C8EB0F6B06CF00A96ABD /* DVDAudioCodecLibDts.cpp in Sources */,
 -                              F5A1C8EC0F6B06CF00A96ABD /* DVDAudioCodecLibFaad.cpp in Sources */,
                                F5A1C8ED0F6B06CF00A96ABD /* DVDAudioCodecLibMad.cpp in Sources */,
                                F5A1C8EE0F6B06CF00A96ABD /* DVDAudioCodecLPcm.cpp in Sources */,
-                               F5A1C8EF0F6B06CF00A96ABD /* DVDAudioCodecPassthrough.cpp in Sources */,
                                F5A1C8F00F6B06CF00A96ABD /* DVDAudioCodecPcm.cpp in Sources */,
                                F5A1C8F10F6B06CF00A96ABD /* DVDCodecUtils.cpp in Sources */,
                                F5A1C8F20F6B06CF00A96ABD /* DVDFactoryCodec.cpp in Sources */,

diff --cc configure.in
index e5f80da,1aff27f..028371a
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -1795,33 -1671,14 +1671,6 @@@ XB_CONFIG_MODULE([lib/libdvd/libdvdnav]
    fi
  ], [0])
  
- XB_CONFIG_MODULE([lib/liba52], [
 -XB_CONFIG_MODULE([lib/libfaad2], [
--  if test "$host_vendor" = "apple" ; then
-     CFLAGS="$CFLAGS -fno-common" \
 -    CFLAGS="$CFLAGS -O3 -fno-common" \
--    ./configure MACOSX_DEPLOYMENT_TARGET=10.4 \
-       --with-pic \
-       --disable-static \
-       --enable-shared \
-       --disable-oss \
-       --disable-solaris-audio \
-       --disable-win \
-       --disable-al-audio
-   else
-     ./configure \
-       --host=$host_alias \
-       --build=$build_alias \
-       --target=$target_alias \      
-       --with-pic \
-       --disable-static \
-       --enable-shared \
-       --disable-oss \
-       --disable-solaris-audio \
-       --disable-win \
-       --disable-al-audio \
-       CFLAGS="$CFLAGS"
 -      --with-pic
--  fi
- ], [$SKIP_CONFIG_LIBA52])
 -], [$HOST_NOT_APPLE])
--
  XB_CONFIG_MODULE([lib/libmad], [
    if test "$host_vendor" = "apple" ; then
      CFLAGS="$CFLAGS -fno-common" \

diff --cc lib/Makefile.in
index fe3066e,970dc52..183f305
--- 1/lib/Makefile.in
--- 2/lib/Makefile.in
+++ b/lib/Makefile.in
@@@ -107,33 -95,20 +94,11 @@@ ffmpeg/libpostproc/libpostproc.dylib : 
  ffmpeg:
        $(MAKE) -C $@
  
- $(SYSDIR)/libdts-$(ARCH).so:  $(WRAPPER_OSX) libdts/libdts/libdts.a
-       $(CC) -bundle -flat_namespace -undefined suppress \
-               -o $@ libdts/libdts/bitstream.o \
-               libdts/libdts/downmix.o \
-               libdts/libdts/parse.o
 -$(SYSDIR)/libfaad-$(ARCH).so:  $(WRAPPER_OSX) libfaad2/libfaad/libfaad.la
 -      ld -bundle -flat_namespace -undefined suppress -o $@ \
 -              libfaad2/libfaad/*.o $(BUNDLE1_O)
--      $(WRAPPER_OSX) $@;mv output.so $@
-       chmod +x $@
--
  $(SYSDIR)/libmad-$(ARCH).so: $(WRAPPER_OSX) libmad/libmad.la
        ld -bundle -flat_namespace -undefined suppress -o $@ \
                libmad/.libs/*.o $(BUNDLE1_O)
        $(WRAPPER_OSX) $@;mv output.so $@
  
- $(SYSDIR)/liba52-$(ARCH).so: $(WRAPPER_OSX) liba52/liba52/liba52.la
-       ld -bundle -flat_namespace -undefined suppress -o $@ \
-               liba52/liba52/.libs/*.o $(BUNDLE1_O)
-       $(WRAPPER_OSX) $@;mv output.so $@
- 
- $(SYSDIR)/libao-$(ARCH).so: $(WRAPPER_OSX) liba52/libao/libao.a
-       ld -bundle -flat_namespace -undefined suppress -o $@ \
-               liba52/libao/libao.a $(BUNDLE1_O)
-       #$(WRAPPER_OSX) $@;mv output.so $@
- 
- libdts/libdts/libdts.a : libdts;
- libdts:
 -libfaad2/libfaad/libfaad.la: libfaad2;
 -libfaad2:
--      $(MAKE) -C $@
--
  libmad/libmad.la: libmad;
  libmad:
        $(MAKE) -C $@

diff --cc project/VS2010Express/XBMC for Windows.sln
Simple merge

diff --cc project/VS2010Express/XBMC.vcxproj
index 5c415a1,38b9c30..32909dc
--- 1/project/VS2010Express/XBMC.vcxproj
--- 2/project/VS2010Express/XBMC.vcxproj
+++ b/project/VS2010Express/XBMC.vcxproj
@@@ -1613,8 -1600,7 +1609,6 @@@
      <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\DVDCodecs.h" />
      <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\DVDCodecUtils.h" />
      <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\DVDFactoryCodec.h" />
-     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DllLiba52.h" />
-     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DllLibDts.h" />
 -    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DllLibFaad.h" />
      <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DllLibMad.h" />
      <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodec.h" />
      <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecFFmpeg.h" />
@@@ -1708,8 -1693,7 +1698,6 @@@
      <ClInclude Include="..\..\lib\DllTimidity.h" />
      <ClInclude Include="..\..\lib\DllVorbisfile.h" />
      <ClInclude Include="..\..\lib\DllWAVPack.h" />
-     <ClInclude Include="..\..\xbmc\cores\paplayer\DTSCDDACodec.h" />
-     <ClInclude Include="..\..\xbmc\cores\paplayer\DTSCodec.h" />
 -    <ClInclude Include="..\..\lib\DllWMA.h" />
      <ClInclude Include="..\..\xbmc\cores\paplayer\DVDPlayerCodec.h" />
      <ClInclude Include="..\..\xbmc\cores\paplayer\FLACcodec.h" />
      <ClInclude Include="..\..\xbmc\cores\paplayer\ICodec.h" />

diff --cc project/VS2010Express/XBMC.vcxproj.filters
index ce4df1a,4446de4..9ea2349
--- 1/project/VS2010Express/XBMC.vcxproj.filters
--- 2/project/VS2010Express/XBMC.vcxproj.filters
+++ b/project/VS2010Express/XBMC.vcxproj.filters
@@@ -2581,12 -2557,9 +2569,6 @@@
      <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\DVDFactoryCodec.h">
        <Filter>cores\dvdplayer\DVDCodecs</Filter>
      </ClInclude>
-     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DllLiba52.h">
-       <Filter>cores\dvdplayer\DVDCodecs\Audio</Filter>
-     </ClInclude>
-     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DllLibDts.h">
 -    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DllLibFaad.h">
--      <Filter>cores\dvdplayer\DVDCodecs\Audio</Filter>
--    </ClInclude>
      <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DllLibMad.h">
        <Filter>cores\dvdplayer\DVDCodecs\Audio</Filter>
      </ClInclude>
@@@ -2860,12 -2830,9 +2830,6 @@@
      <ClInclude Include="..\..\lib\DllWAVPack.h">
        <Filter>cores\paplayer</Filter>
      </ClInclude>
-     <ClInclude Include="..\..\xbmc\cores\paplayer\DTSCDDACodec.h">
-       <Filter>cores\paplayer</Filter>
-     </ClInclude>
-     <ClInclude Include="..\..\xbmc\cores\paplayer\DTSCodec.h">
 -    <ClInclude Include="..\..\lib\DllWMA.h">
--      <Filter>cores\paplayer</Filter>
--    </ClInclude>
      <ClInclude Include="..\..\xbmc\cores\paplayer\DVDPlayerCodec.h">
        <Filter>cores\paplayer</Filter>
      </ClInclude>

diff --cc xbmc/DllPaths_generated.h.in
Simple merge

diff --cc xbmc/DllPaths_win32.h
index 0b13e62,0b174b2..7d03f90
--- 1/xbmc/DllPaths_win32.h
--- 2/xbmc/DllPaths_win32.h
+++ b/xbmc/DllPaths_win32.h
@@@ -55,8 -54,7 +54,6 @@@
  
  /* dvdplayer */
  #define DLL_PATH_LIBASS        "special://xbmcbin/system/players/dvdplayer/libass.dll"
- #define DLL_PATH_LIBA52        "special://xbmcbin/system/players/dvdplayer/liba52.dll"
- #define DLL_PATH_LIBDTS        "special://xbmcbin/system/players/dvdplayer/libdts.dll"
 -#define DLL_PATH_LIBFAAD       "special://xbmcbin/system/players/dvdplayer/libfaad.dll"
  #define DLL_PATH_LIBMAD        "special://xbmcbin/system/players/dvdplayer/libmad.dll"
  #define DLL_PATH_LIBMPEG2      "special://xbmcbin/system/players/dvdplayer/libmpeg2.dll"
  #define DLL_PATH_LIBDVDNAV     "special://xbmcbin/system/players/dvdplayer/libdvdnav.dll"

diff --cc xbmc/cores/dvdplayer/DVDCodecs/Audio/Makefile.in
index 5ce27f8,f527992..c40ee33
--- 1/xbmc/cores/dvdplayer/DVDCodecs/Audio/Makefile.in
--- 2/xbmc/cores/dvdplayer/DVDCodecs/Audio/Makefile.in
+++ b/xbmc/cores/dvdplayer/DVDCodecs/Audio/Makefile.in
@@@ -3,11 -3,9 +3,8 @@@ INCLUDES+=-I@abs_top_srcdir@/xbmc/cores
  CXXFLAGS+=-DHAVE_MMX
  
  SRCS= DVDAudioCodecFFmpeg.cpp \
-       DVDAudioCodecLiba52.cpp \
-       DVDAudioCodecLibDts.cpp \
 -      DVDAudioCodecLibFaad.cpp \
        DVDAudioCodecLibMad.cpp \
        DVDAudioCodecLPcm.cpp \
-       DVDAudioCodecPassthrough.cpp \
          DVDAudioCodecPassthroughFFmpeg.cpp \
        DVDAudioCodecPcm.cpp \
        Encoders/DVDAudioEncoderFFmpeg.cpp

diff --cc xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp
index d69ea05,4492ec1..9256296
--- 1/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp
--- 2/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp
+++ b/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp
@@@ -35,18 -35,12 +35,9 @@@
  #include "Video/DVDVideoCodecCrystalHD.h"
  #endif
  #include "Audio/DVDAudioCodecFFmpeg.h"
- #ifdef USE_LIBA52_DECODER
-   #include "Audio/DVDAudioCodecLiba52.h"
- #endif
- #ifdef USE_LIBDTS_DECODER
-   #include "Audio/DVDAudioCodecLibDts.h"
- #endif
  #include "Audio/DVDAudioCodecLibMad.h"
 -#ifdef USE_LIBFAAD_DECODER
 -  #include "Audio/DVDAudioCodecLibFaad.h"
 -#endif
  #include "Audio/DVDAudioCodecPcm.h"
  #include "Audio/DVDAudioCodecLPcm.h"
- #if defined(USE_LIBA52_DECODER) || defined(USE_LIBDTS_DECODER)
-   #include "Audio/DVDAudioCodecPassthrough.h"
- #endif
  #include "Audio/DVDAudioCodecPassthroughFFmpeg.h"
  #include "Overlay/DVDOverlayCodecSSA.h"
  #include "Overlay/DVDOverlayCodecText.h"