7 files changed, 1 insertions, 13 deletions
diff --git a/mp3lib/dct36.c b/mp3lib/dct36.c
index 753c2f25d5..b884bb949d 100644
--- a/mp3lib/dct36.c
+++ b/mp3lib/dct36.c
@@ -267,4 +267,3 @@ static void dct36(real *inbuf,real *o1,real *o2,real *wintab,real *tsbuf)
 
   }
 }
-
diff --git a/mp3lib/dct64_sse.c b/mp3lib/dct64_sse.c
index 9381b2adf7..56caeddd71 100644
--- a/mp3lib/dct64_sse.c
+++ b/mp3lib/dct64_sse.c
@@ -5,7 +5,7 @@
  * and mp3lib/dct64_mmx.c
  */
 
-#include "libavutil/internal.h"
+#include "libavutil/mem.h"
 
 typedef float real;
 
diff --git a/mp3lib/huffman.h b/mp3lib/huffman.h
index aa9e7b91fa..63cb978c7e 100644
--- a/mp3lib/huffman.h
+++ b/mp3lib/huffman.h
@@ -328,5 +328,3 @@ static struct newhuff htc[] =
  { /* 1 , 1 , */ 0 , tab_c0 } ,
  { /* 1 , 1 , */ 0 , tab_c1 }
 };
-
-
diff --git a/mp3lib/l2tables.h b/mp3lib/l2tables.h
index f62a546088..5f08a4f5a7 100644
--- a/mp3lib/l2tables.h
+++ b/mp3lib/l2tables.h
@@ -157,4 +157,3 @@ static struct al_table alloc_4[] = {
     {2,0},{5,3},{7,5},{10,9},
     {2,0},{5,3},{7,5},{10,9},
     {2,0},{5,3},{7,5},{10,9}  };
-
diff --git a/mp3lib/layer1.c b/mp3lib/layer1.c
index 9a50b5df47..3b560ec24b 100644
--- a/mp3lib/layer1.c
+++ b/mp3lib/layer1.c
@@ -163,5 +163,3 @@ static int do_layer1(struct frame *fr,int single)
 
   return clip;
 }
-
-
diff --git a/mp3lib/layer3.c b/mp3lib/layer3.c
index 398e631913..b89bc9844d 100644
--- a/mp3lib/layer3.c
+++ b/mp3lib/layer3.c
@@ -1345,5 +1345,3 @@ static int do_layer3(struct frame *fr,int single){
 
   return clip;
 }
-
-
diff --git a/mp3lib/sr1.c b/mp3lib/sr1.c
index 224f838c7d..68180533e2 100644
--- a/mp3lib/sr1.c
+++ b/mp3lib/sr1.c
@@ -27,10 +27,6 @@
 #include "libvo/fastmemcpy.h"
 
 #include "libavutil/common.h"
-#include "libavutil/internal.h"
-
-#undef fprintf
-#undef printf
 
 #if ARCH_X86_64
 // 3DNow! and 3DNow!Ext routines don't compile under AMD64