14 files changed, 11 insertions, 11 deletions
diff --git a/plugins/aac/Makefile.am b/plugins/aac/Makefile.am
index afef6c55..deab8c8f 100644
--- a/plugins/aac/Makefile.am
+++ b/plugins/aac/Makefile.am
@@ -2,19 +2,19 @@ if HAVE_AAC
 aacdir = $(libdir)/$(PACKAGE)
 pkglib_LTLIBRARIES = aac.la
 aac_la_SOURCES = aac.c aac_parser.c aac_parser.h\
-mp4ff/mp4atom.c\
-mp4ff/mp4ff.c\
-mp4ff/mp4meta.c\
-mp4ff/mp4sample.c\
-mp4ff/mp4tagupdate.c\
-mp4ff/mp4util.c\
-mp4ff/mp4ff.h\
-mp4ff/mp4ffint.h\
-mp4ff/mp4ff_int_types.h
+../libmp4ff/mp4atom.c\
+../libmp4ff/mp4ff.c\
+../libmp4ff/mp4meta.c\
+../libmp4ff/mp4sample.c\
+../libmp4ff/mp4tagupdate.c\
+../libmp4ff/mp4util.c\
+../libmp4ff/mp4ff.h\
+../libmp4ff/mp4ffint.h\
+../libmp4ff/mp4ff_int_types.h
 
 aac_la_LDFLAGS = -module
 
 aac_la_LIBADD = $(LDADD) $(FAAD2_LIBS)
-AM_CFLAGS = $(CFLAGS) -std=c99 -DUSE_MP4FF -DUSE_TAGGING
+AM_CFLAGS = $(CFLAGS) -std=c99 -DUSE_MP4FF -DUSE_TAGGING -I../libmp4ff
 endif
 
diff --git a/plugins/aac/aac.c b/plugins/aac/aac.c
index 99231057..44eaae7c 100644
--- a/plugins/aac/aac.c
+++ b/plugins/aac/aac.c
@@ -30,7 +30,7 @@
 #include "aac_parser.h"
 
 #ifdef USE_MP4FF
-#include "mp4ff/mp4ff.h"
+#include "mp4ff.h"
 #else
 #warning linking mp4v2 to faad2 is illegal
 #include <mp4v2/mp4v2.h>
diff --git a/plugins/aac/mp4ff/AUTHORS b/plugins/libmp4ff/AUTHORS
index 4f8d7660..4f8d7660 100644
--- a/plugins/aac/mp4ff/AUTHORS
+++ b/plugins/libmp4ff/AUTHORS
diff --git a/plugins/aac/mp4ff/COPYING b/plugins/libmp4ff/COPYING
index 920c4e67..920c4e67 100644
--- a/plugins/aac/mp4ff/COPYING
+++ b/plugins/libmp4ff/COPYING
diff --git a/plugins/aac/mp4ff/README b/plugins/libmp4ff/README
index c50e110a..c50e110a 100644
--- a/plugins/aac/mp4ff/README
+++ b/plugins/libmp4ff/README
diff --git a/plugins/aac/mp4ff/mp4atom.c b/plugins/libmp4ff/mp4atom.c
index c735c2ae..c735c2ae 100644
--- a/plugins/aac/mp4ff/mp4atom.c
+++ b/plugins/libmp4ff/mp4atom.c
diff --git a/plugins/aac/mp4ff/mp4ff.c b/plugins/libmp4ff/mp4ff.c
index ce33aad5..ce33aad5 100644
--- a/plugins/aac/mp4ff/mp4ff.c
+++ b/plugins/libmp4ff/mp4ff.c
diff --git a/plugins/aac/mp4ff/mp4ff.h b/plugins/libmp4ff/mp4ff.h
index f8828f4f..f8828f4f 100644
--- a/plugins/aac/mp4ff/mp4ff.h
+++ b/plugins/libmp4ff/mp4ff.h
diff --git a/plugins/aac/mp4ff/mp4ff_int_types.h b/plugins/libmp4ff/mp4ff_int_types.h
index 15e7fd60..15e7fd60 100644
--- a/plugins/aac/mp4ff/mp4ff_int_types.h
+++ b/plugins/libmp4ff/mp4ff_int_types.h
diff --git a/plugins/aac/mp4ff/mp4ffint.h b/plugins/libmp4ff/mp4ffint.h
index f4673b03..f4673b03 100644
--- a/plugins/aac/mp4ff/mp4ffint.h
+++ b/plugins/libmp4ff/mp4ffint.h
diff --git a/plugins/aac/mp4ff/mp4meta.c b/plugins/libmp4ff/mp4meta.c
index 5e13c693..5e13c693 100644
--- a/plugins/aac/mp4ff/mp4meta.c
+++ b/plugins/libmp4ff/mp4meta.c
diff --git a/plugins/aac/mp4ff/mp4sample.c b/plugins/libmp4ff/mp4sample.c
index 95994641..95994641 100644
--- a/plugins/aac/mp4ff/mp4sample.c
+++ b/plugins/libmp4ff/mp4sample.c
diff --git a/plugins/aac/mp4ff/mp4tagupdate.c b/plugins/libmp4ff/mp4tagupdate.c
index 79b59c71..79b59c71 100644
--- a/plugins/aac/mp4ff/mp4tagupdate.c
+++ b/plugins/libmp4ff/mp4tagupdate.c
diff --git a/plugins/aac/mp4ff/mp4util.c b/plugins/libmp4ff/mp4util.c
index 24d89c7b..24d89c7b 100644
--- a/plugins/aac/mp4ff/mp4util.c
+++ b/plugins/libmp4ff/mp4util.c