--- faad2/configure.in.orig	2006-01-17 07:20:33.000000000 +0100
+++ faad2/configure.in	2006-01-17 07:20:49.000000000 +0100
@@ -121,8 +121,6 @@ if test x$WITHXMMS = xyes; then
   fi
 
   AM_CONDITIONAL(HAVE_XMMS, true)
-  AC_MSG_NOTICE("xmms plugin requires libmp4v2 to be build")
-  AM_CONDITIONAL(WITH_MP4V2, true)
   AC_CONFIG_FILES(plugins/xmms/Makefile plugins/xmms/src/Makefile)
 else
  AC_MSG_NOTICE(no xmms build configured)
--- faad2/plugins/xmms/src/Makefile.am.orig	2006-01-17 08:01:39.000000000 +0100
+++ faad2/plugins/xmms/src/Makefile.am	2006-01-17 08:02:17.000000000 +0100
@@ -3,11 +3,10 @@ lib_LTLIBRARIES = libmp4.la
 
 libmp4_la_CFLAGS = `$(XMMS_CONFIG) --cflags` -Wall \
        `$(GTK_CONFIG) --cflags` -DHAVE_GLIB_H=1 \
-       -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2
+       -I$(top_srcdir)/include -I/usr/include/libmp4v2
 
-libmp4_la_LIBADD = $(top_builddir)/libfaad/libfaad.la \
-       $(top_builddir)/common/mp4v2/libmp4v2.la
+libmp4_la_LIBADD = $(top_builddir)/libfaad/libfaad.la
 
 libmp4_la_LDFLAGS = -module -avoid-version `$(XMMS_CONFIG) --libs` \
-       `$(GTK_CONFIG) --libs` -lpthread -lstdc++
+       `$(GTK_CONFIG) --libs` -lpthread -lstdc++ -lmp4v2
 libmp4_la_SOURCES = libmp4.c mp4_utils.c aac_utils.c
--- faad2/plugins/xmms/src/mp4_utils.c.orig	2006-01-17 08:24:48.000000000 +0100
+++ faad2/plugins/xmms/src/mp4_utils.c	2006-01-17 08:26:13.000000000 +0100
@@ -54,7 +54,7 @@ int getAACTrack(MP4FileHandle file)
     const char *trackType = MP4GetTrackType(file, trackID);
     if(!strcmp(trackType, MP4_AUDIO_TRACK_TYPE)){//we found audio track !
       int j=0;
-      u_int8_t audiotype = MP4GetTrackAudioType(file, trackID);
+      u_int8_t audiotype = MP4GetTrackEsdsObjectTypeId(file, trackID);
       while(mp4AudioTypes[j]){ // what kind of audio is ?
 	if(mp4AudioTypes[j] == audiotype){
 	  if(mp4AudioTypes[j] == MP4_MPEG4_AUDIO_TYPE){//MPEG4 audio ok
@@ -126,7 +126,7 @@ void getMP4info(char* file)
     printf("Track %d, %s", trackID, trackType);
     if(!strcmp(trackType, MP4_AUDIO_TRACK_TYPE)){//we found audio track !
       int j=0;
-      u_int8_t audiotype = MP4GetTrackAudioType(mp4file, trackID);
+      u_int8_t audiotype = MP4GetTrackEsdsObjectTypeId(mp4file, trackID);
       while(mp4AudioTypes[j]){ // what kind of audio is ?
 	if(mp4AudioTypes[j] == audiotype){
 	  if(mp4AudioTypes[j] == MP4_MPEG4_AUDIO_TYPE){