Remove unnecessary malloc.h #includes and related #ifdeffery.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29126 b3059339-0415-0410-9bf9-f77b7e298cf2

26 files changed, 0 insertions, 123 deletions

diff --git a/cpudetect.c b/cpudetect.c
index 62afe5895e..b5eb47e970 100644
--- a/cpudetect.c
+++ b/cpudetect.c
@@ -4,9 +4,6 @@
 
 CpuCaps gCpuCaps;
 
-#if HAVE_MALLOC_H
-#include <malloc.h>
-#endif
 #include <stdlib.h>
 
 #if ARCH_X86
diff --git a/libaf/af.c b/libaf/af.c
index 33819c71a5..ca25e44a9e 100644
--- a/libaf/af.c
+++ b/libaf/af.c
@@ -21,10 +21,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#if HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-
 #include "af.h"
 
 // Static list of filters
diff --git a/libmenu/vf_menu.c b/libmenu/vf_menu.c
index 7f93b1a840..8fe82b351c 100644
--- a/libmenu/vf_menu.c
+++ b/libmenu/vf_menu.c
@@ -24,10 +24,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#if HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-
 #include "mplayer.h"
 #include "mp_msg.h"
 
diff --git a/libmpcodecs/dec_audio.c b/libmpcodecs/dec_audio.c
index 79073d03e3..a15640c552 100644
--- a/libmpcodecs/dec_audio.c
+++ b/libmpcodecs/dec_audio.c
@@ -19,10 +19,6 @@
 
 #include "libaf/af.h"
 
-#if HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-
 #ifdef CONFIG_DYNAMIC_PLUGINS
 #include <dlfcn.h>
 #endif
diff --git a/libmpcodecs/dec_video.c b/libmpcodecs/dec_video.c
index 4186bd5e72..d5137e5fa8 100644
--- a/libmpcodecs/dec_video.c
+++ b/libmpcodecs/dec_video.c
@@ -2,9 +2,6 @@
 #include "config.h"
 
 #include <stdio.h>
-#if HAVE_MALLOC_H
-#include <malloc.h>
-#endif
 #include <stdlib.h>
 #include <unistd.h>
 
diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c
index fa2f74ef00..9f1b2ee2c8 100644
--- a/libmpcodecs/vd.c
+++ b/libmpcodecs/vd.c
@@ -6,10 +6,6 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#if HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-
 #include "codec-cfg.h"
 //#include "mp_image.h"
 
diff --git a/libmpcodecs/vf_boxblur.c b/libmpcodecs/vf_boxblur.c
index f322619104..e830841027 100644
--- a/libmpcodecs/vf_boxblur.c
+++ b/libmpcodecs/vf_boxblur.c
@@ -24,13 +24,7 @@
 #include <inttypes.h>
 #include <assert.h>
 
-#include "config.h"
 #include "mp_msg.h"
-
-#if HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
diff --git a/libmpcodecs/vf_delogo.c b/libmpcodecs/vf_delogo.c
index 3ab2ab5f8f..c6396d4aa0 100644
--- a/libmpcodecs/vf_delogo.c
+++ b/libmpcodecs/vf_delogo.c
@@ -26,14 +26,8 @@
 #include <inttypes.h>
 #include <math.h>
 
-#include "config.h"
 #include "mp_msg.h"
 #include "cpudetect.h"
-
-#if HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
diff --git a/libmpcodecs/vf_denoise3d.c b/libmpcodecs/vf_denoise3d.c
index 6899045611..0958305936 100644
--- a/libmpcodecs/vf_denoise3d.c
+++ b/libmpcodecs/vf_denoise3d.c
@@ -24,13 +24,7 @@
 #include <inttypes.h>
 #include <math.h>
 
-#include "config.h"
 #include "mp_msg.h"
-
-#if HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
diff --git a/libmpcodecs/vf_fspp.c b/libmpcodecs/vf_fspp.c
index 5acdfb3602..55b28c7439 100644
--- a/libmpcodecs/vf_fspp.c
+++ b/libmpcodecs/vf_fspp.c
@@ -42,11 +42,6 @@
 
 #include "mp_msg.h"
 #include "cpudetect.h"
-
-#if HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
diff --git a/libmpcodecs/vf_hqdn3d.c b/libmpcodecs/vf_hqdn3d.c
index e0b6f78bb1..348e731449 100644
--- a/libmpcodecs/vf_hqdn3d.c
+++ b/libmpcodecs/vf_hqdn3d.c
@@ -24,13 +24,7 @@
 #include <inttypes.h>
 #include <math.h>
 
-#include "config.h"
 #include "mp_msg.h"
-
-#if HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
diff --git a/libmpcodecs/vf_il.c b/libmpcodecs/vf_il.c
index cd6ba0490b..9a38d2ac33 100644
--- a/libmpcodecs/vf_il.c
+++ b/libmpcodecs/vf_il.c
@@ -24,13 +24,7 @@
 #include <inttypes.h>
 #include <assert.h>
 
-#include "config.h"
 #include "mp_msg.h"
-
-#if HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
diff --git a/libmpcodecs/vf_kerndeint.c b/libmpcodecs/vf_kerndeint.c
index ac51acfb3b..a2bc0ed0c0 100644
--- a/libmpcodecs/vf_kerndeint.c
+++ b/libmpcodecs/vf_kerndeint.c
@@ -25,13 +25,7 @@
 #include <inttypes.h>
 #include <math.h>
 
-#include "config.h"
 #include "mp_msg.h"
-
-#if HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
diff --git a/libmpcodecs/vf_mcdeint.c b/libmpcodecs/vf_mcdeint.c
index aae4872537..ecb79957be 100644
--- a/libmpcodecs/vf_mcdeint.c
+++ b/libmpcodecs/vf_mcdeint.c
@@ -51,8 +51,6 @@ Known Issues:
 #include <inttypes.h>
 #include <math.h>
 
-#include "config.h"
-
 #include "mp_msg.h"
 #include "cpudetect.h"
 
@@ -65,10 +63,6 @@ Known Issues:
 #undef free
 #undef malloc
 
-#if HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
diff --git a/libmpcodecs/vf_ow.c b/libmpcodecs/vf_ow.c
index 59c4e22852..81ad5fbc77 100644
--- a/libmpcodecs/vf_ow.c
+++ b/libmpcodecs/vf_ow.c
@@ -32,14 +32,7 @@
 #include <inttypes.h>
 #include <math.h>
 
-#include "config.h"
-
 #include "mp_msg.h"
-
-#if HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
diff --git a/libmpcodecs/vf_qp.c b/libmpcodecs/vf_qp.c
index 8a345a9f03..bd8e561d76 100644
--- a/libmpcodecs/vf_qp.c
+++ b/libmpcodecs/vf_qp.c
@@ -24,8 +24,6 @@
 #include <math.h>
 #include <inttypes.h>
 
-#include "config.h"
-
 #include "mp_msg.h"
 #include "cpudetect.h"
 #include "img_format.h"
@@ -36,10 +34,6 @@
 #include "libavcodec/avcodec.h"
 #include "libavcodec/eval.h"
 
-#if HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-
 
 struct vf_priv_s {
 	char eq[200];
diff --git a/libmpcodecs/vf_smartblur.c b/libmpcodecs/vf_smartblur.c
index b18f54436a..ebe18dc840 100644
--- a/libmpcodecs/vf_smartblur.c
+++ b/libmpcodecs/vf_smartblur.c
@@ -24,13 +24,7 @@
 #include <inttypes.h>
 #include <assert.h>
 
-#include "config.h"
 #include "mp_msg.h"
-
-#if HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-
 #include "libavutil/avutil.h"
 #include "img_format.h"
 #include "mp_image.h"
diff --git a/libmpcodecs/vf_spp.c b/libmpcodecs/vf_spp.c
index ebce63601f..6d478e92ae 100644
--- a/libmpcodecs/vf_spp.c
+++ b/libmpcodecs/vf_spp.c
@@ -46,10 +46,6 @@
 #undef free
 #undef malloc
 
-#if HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
diff --git a/libmpcodecs/vf_swapuv.c b/libmpcodecs/vf_swapuv.c
index db32686c40..2ac52a39aa 100644
--- a/libmpcodecs/vf_swapuv.c
+++ b/libmpcodecs/vf_swapuv.c
@@ -24,13 +24,7 @@
 #include <inttypes.h>
 #include <assert.h>
 
-#include "config.h"
 #include "mp_msg.h"
-
-#if HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
diff --git a/libmpcodecs/vf_uspp.c b/libmpcodecs/vf_uspp.c
index 57186698c7..64e08749fa 100644
--- a/libmpcodecs/vf_uspp.c
+++ b/libmpcodecs/vf_uspp.c
@@ -32,10 +32,6 @@
 
 #include "libavcodec/avcodec.h"
 
-#if HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
diff --git a/libmpcodecs/vf_yadif.c b/libmpcodecs/vf_yadif.c
index 0eecb7fb82..4b408a2e21 100644
--- a/libmpcodecs/vf_yadif.c
+++ b/libmpcodecs/vf_yadif.c
@@ -28,11 +28,6 @@
 #include "cpudetect.h"
 
 #include "mp_msg.h"
-
-#if HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
diff --git a/libmpdemux/parse_mp4.c b/libmpdemux/parse_mp4.c
index ed801d73e5..f2a39abe6e 100644
--- a/libmpdemux/parse_mp4.c
+++ b/libmpdemux/parse_mp4.c
@@ -21,12 +21,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include <stdio.h>
 #include <inttypes.h>
-#if HAVE_MALLOC_H
-#include <malloc.h>
-#endif
 #include <stdlib.h>
 #include "parse_mp4.h"
 #include "mp_msg.h"
diff --git a/libvo/vo_dxr3.c b/libvo/vo_dxr3.c
index c5fa8a970d..de1f2b47ac 100644
--- a/libvo/vo_dxr3.c
+++ b/libvo/vo_dxr3.c
@@ -37,9 +37,6 @@
 #include "config.h"
 #include "mp_msg.h"
 #include "help_mp.h"
-#if HAVE_MALLOC_H
-#include <malloc.h>
-#endif
 #include "fastmemcpy.h"
 
 #include "video_out.h"
diff --git a/loader/drv.c b/loader/drv.c
index e3fb4da116..43d9485646 100644
--- a/loader/drv.c
+++ b/loader/drv.c
@@ -7,9 +7,6 @@
 #include "debug.h"
 
 #include <stdio.h>
-#if HAVE_MALLOC_H
-#include <malloc.h>
-#endif
 #include <stdlib.h>
 #ifdef __FreeBSD__
 #include <sys/time.h>
diff --git a/loader/ext.c b/loader/ext.c
index 0486f7c09b..b57eed674b 100644
--- a/loader/ext.c
+++ b/loader/ext.c
@@ -14,9 +14,6 @@
 #include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
-#if HAVE_MALLOC_H
-#include <malloc.h>
-#endif
 #include <unistd.h>
 #ifdef HAVE_SYS_MMAN_H
 #include <sys/mman.h>
diff --git a/loader/win32.c b/loader/win32.c
index 3aded84674..4287c5b0b1 100644
--- a/loader/win32.c
+++ b/loader/win32.c
@@ -53,9 +53,6 @@ for DLL to know too much about its environment.
 #include <ctype.h>
 #include <pthread.h>
 #include <errno.h>
-#if HAVE_MALLOC_H
-#include <malloc.h>
-#endif
 #include <time.h>
 #include <math.h>
 #include <unistd.h>