From d1a54d56965f98777423d6ddd0033c0303c5a098 Mon Sep 17 00:00:00 2001
From: Uoti Urpala <uau@glyph.nonexistent.invalid>
Date: Tue, 21 Jul 2009 19:44:22 +0300
Subject: [PATCH] Remove unnecessary libavutil/internal.h includes

These includes were added earlier after the definition of the
DECLARE_ALIGNED and DECLARE_ASM_CONST macros were moved to this
header in FFmpeg. However now those macros are again in the public
mem.h header, and there is no need to include internal.h.
---
 libmpcodecs/vf_mcdeint.c | 5 -----
 libmpcodecs/vf_pp.c      | 1 -
 libmpcodecs/vf_spp.c     | 5 -----
 mp3lib/dct64_sse.c       | 2 +-
 mp3lib/sr1.c             | 4 ----
 5 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/libmpcodecs/vf_mcdeint.c b/libmpcodecs/vf_mcdeint.c
index 0b6547359a..1dbe096349 100644
--- a/libmpcodecs/vf_mcdeint.c
+++ b/libmpcodecs/vf_mcdeint.c
@@ -54,15 +54,10 @@ Known Issues:
 #include "mp_msg.h"
 #include "cpudetect.h"
 
-#include "libavutil/internal.h"
 #include "libavutil/intreadwrite.h"
 #include "libavcodec/avcodec.h"
 #include "libavcodec/dsputil.h"
 
-#undef fprintf
-#undef free
-#undef malloc
-
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
diff --git a/libmpcodecs/vf_pp.c b/libmpcodecs/vf_pp.c
index 933688d1e6..c9425f146a 100644
--- a/libmpcodecs/vf_pp.c
+++ b/libmpcodecs/vf_pp.c
@@ -15,7 +15,6 @@
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "libavutil/internal.h"
 #include "libpostproc/postprocess.h"
 
 #ifdef CONFIG_LIBPOSTPROC_A
diff --git a/libmpcodecs/vf_spp.c b/libmpcodecs/vf_spp.c
index 73c9e54ee6..85d7ff9fc1 100644
--- a/libmpcodecs/vf_spp.c
+++ b/libmpcodecs/vf_spp.c
@@ -37,15 +37,10 @@
 #include "mp_msg.h"
 #include "cpudetect.h"
 
-#include "libavutil/internal.h"
 #include "libavutil/intreadwrite.h"
 #include "libavcodec/avcodec.h"
 #include "libavcodec/dsputil.h"
 
-#undef fprintf
-#undef free
-#undef malloc
-
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
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/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