Index: /mppenc/branches/r2d/libmpcenc/Makefile.am
===================================================================
--- /mppenc/branches/r2d/libmpcenc/Makefile.am	(revision 66)
+++ /mppenc/branches/r2d/libmpcenc/Makefile.am	(revision 67)
@@ -1,3 +1,3 @@
-INCLUDES = -I../../common
+INCLUDES = -I$(top_srcdir)/common
 METASOURCES = AUTO
 lib_LIBRARIES = libmpcenc.a
Index: /mppenc/branches/r2d/libmpcenc/libmpcenc.h
===================================================================
--- /mppenc/branches/r2d/libmpcenc/libmpcenc.h	(revision 66)
+++ /mppenc/branches/r2d/libmpcenc/libmpcenc.h	(revision 67)
@@ -34,4 +34,11 @@
 #define BUFFER_ALMOST_FULL  8192
 #define BUFFER_FULL         (BUFFER_ALMOST_FULL + 4352)         // 34490 bit/frame  1320.3 kbps
+
+#ifndef ENDIAN
+#define HAVE_LITTLE_ENDIAN  1234
+#define HAVE_BIG_ENDIAN     4321
+
+#define ENDIAN              HAVE_LITTLE_ENDIAN
+#endif
 
 // bitstream.c
Index: /mppenc/branches/r2d/libmpcpsy/Makefile.am
===================================================================
--- /mppenc/branches/r2d/libmpcpsy/Makefile.am	(revision 66)
+++ /mppenc/branches/r2d/libmpcpsy/Makefile.am	(revision 67)
@@ -1,3 +1,3 @@
-INCLUDES = -I../../common
+INCLUDES = -I$(top_srcdir)/common
 METASOURCES = AUTO
 lib_LIBRARIES = libmpcpsy.a
Index: /mppenc/branches/r2d/mppenc.kdevelop
===================================================================
--- /mppenc/branches/r2d/mppenc.kdevelop	(revision 66)
+++ /mppenc/branches/r2d/mppenc.kdevelop	(revision 67)
@@ -3,5 +3,5 @@
   <general>
     <author>Nicolas Botti</author>
-    <email></email>
+    <email/>
     <version>0.1</version>
     <projectmanagement>KDevAutoProject</projectmanagement>
@@ -14,5 +14,5 @@
     <projectdirectory>.</projectdirectory>
     <absoluteprojectpath>false</absoluteprojectpath>
-    <description></description>
+    <description/>
   </general>
   <kdevautoproject>
@@ -29,5 +29,5 @@
       </runarguments>
       <customdirectory>/</customdirectory>
-      <programargs></programargs>
+      <programargs/>
       <autocompile>true</autocompile>
       <envvars/>
@@ -49,12 +49,12 @@
         <cflags>-O0 -g3 -Wmissing-prototypes -Wmissing-prototypes</cflags>
         <envvars/>
-        <topsourcedir></topsourcedir>
+        <topsourcedir/>
         <cppflags>-DMPP_ENCODER=1 -DTRUE=1 -DFALSE=0</cppflags>
-        <ldflags></ldflags>
-        <ccompilerbinary></ccompilerbinary>
-        <cxxcompilerbinary></cxxcompilerbinary>
-        <f77compilerbinary></f77compilerbinary>
-        <cxxflags></cxxflags>
-        <f77flags></f77flags>
+        <ldflags/>
+        <ccompilerbinary/>
+        <cxxcompilerbinary/>
+        <f77compilerbinary/>
+        <cxxflags/>
+        <f77flags/>
       </debug>
     </configurations>
@@ -67,5 +67,5 @@
       <numberofjobs>1</numberofjobs>
       <dontact>false</dontact>
-      <makebin></makebin>
+      <makebin/>
       <prio>0</prio>
     </make>
@@ -174,5 +174,5 @@
     </codecompletion>
     <creategettersetter>
-      <prefixGet></prefixGet>
+      <prefixGet/>
       <prefixSet>set</prefixSet>
       <prefixVariable>m_,_</prefixVariable>
@@ -191,9 +191,9 @@
     <general>
       <programargs>--overwrite ~/seeking_bug.flac</programargs>
-      <gdbpath></gdbpath>
+      <gdbpath/>
       <dbgshell>libtool</dbgshell>
-      <configGdbScript></configGdbScript>
-      <runShellScript></runShellScript>
-      <runGdbScript></runGdbScript>
+      <configGdbScript/>
+      <runShellScript/>
+      <runGdbScript/>
       <breakonloadinglibs>true</breakonloadinglibs>
       <separatetty>false</separatetty>
Index: /mppenc/branches/r2d/src/Makefile.am
===================================================================
--- /mppenc/branches/r2d/src/Makefile.am	(revision 66)
+++ /mppenc/branches/r2d/src/Makefile.am	(revision 67)
@@ -3,6 +3,6 @@
 
 # set the include path found by configure
-INCLUDES = -I$(top_srcdir)/libmpcenc -I$(top_srcdir)/libmpcpsy -I../../common \
-	$(all_includes)
+INCLUDES = -I$(top_srcdir)/libmpcenc -I$(top_srcdir)/libmpcpsy \
+	-I$(top_srcdir)/common $(all_includes)
 
 # the library search path.
Index: /mppenc/branches/r2d/src/mppenc.c
===================================================================
--- /mppenc/branches/r2d/src/mppenc.c	(revision 66)
+++ /mppenc/branches/r2d/src/mppenc.c	(revision 67)
@@ -1596,7 +1596,8 @@
 #endif
     Init_SV7 ();
+	Init_Psychoakustik (&m);
+	SetQualityParams (&m, 5.0);
     Init_Psychoakustiktabellen (&m);
 	Init_Skalenfaktoren ();
-	Init_Psychoakustik (&m);
 	Init_FPU ();
 	Init_ANS ();