changeset 29087:290420c32921

Remove unnecessary malloc.h #includes and related #ifdeffery.
author diego
date Thu, 02 Apr 2009 09:20:48 +0000
parents b5c25fd3cf8f
children d8a28bef8bc3
files cpudetect.c libaf/af.c libmenu/vf_menu.c libmpcodecs/dec_audio.c libmpcodecs/dec_video.c libmpcodecs/vd.c libmpcodecs/vf_boxblur.c libmpcodecs/vf_delogo.c libmpcodecs/vf_denoise3d.c libmpcodecs/vf_fspp.c libmpcodecs/vf_hqdn3d.c libmpcodecs/vf_il.c libmpcodecs/vf_kerndeint.c libmpcodecs/vf_mcdeint.c libmpcodecs/vf_ow.c libmpcodecs/vf_qp.c libmpcodecs/vf_smartblur.c libmpcodecs/vf_spp.c libmpcodecs/vf_swapuv.c libmpcodecs/vf_uspp.c libmpcodecs/vf_yadif.c libmpdemux/parse_mp4.c libvo/vo_dxr3.c loader/drv.c loader/ext.c loader/win32.c
diffstat 26 files changed, 0 insertions(+), 123 deletions(-) [+]
line wrap: on
line diff
--- a/cpudetect.c	Thu Apr 02 08:42:16 2009 +0000
+++ b/cpudetect.c	Thu Apr 02 09:20:48 2009 +0000
@@ -4,9 +4,6 @@
 
 CpuCaps gCpuCaps;
 
-#if HAVE_MALLOC_H
-#include <malloc.h>
-#endif
 #include <stdlib.h>
 
 #if ARCH_X86
--- a/libaf/af.c	Thu Apr 02 08:42:16 2009 +0000
+++ b/libaf/af.c	Thu Apr 02 09:20:48 2009 +0000
@@ -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
--- a/libmenu/vf_menu.c	Thu Apr 02 08:42:16 2009 +0000
+++ b/libmenu/vf_menu.c	Thu Apr 02 09:20:48 2009 +0000
@@ -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"
 
--- a/libmpcodecs/dec_audio.c	Thu Apr 02 08:42:16 2009 +0000
+++ b/libmpcodecs/dec_audio.c	Thu Apr 02 09:20:48 2009 +0000
@@ -19,10 +19,6 @@
 
 #include "libaf/af.h"
 
-#if HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-
 #ifdef CONFIG_DYNAMIC_PLUGINS
 #include <dlfcn.h>
 #endif
--- a/libmpcodecs/dec_video.c	Thu Apr 02 08:42:16 2009 +0000
+++ b/libmpcodecs/dec_video.c	Thu Apr 02 09:20:48 2009 +0000
@@ -2,9 +2,6 @@
 #include "config.h"
 
 #include <stdio.h>
-#if HAVE_MALLOC_H
-#include <malloc.h>
-#endif
 #include <stdlib.h>
 #include <unistd.h>
 
--- a/libmpcodecs/vd.c	Thu Apr 02 08:42:16 2009 +0000
+++ b/libmpcodecs/vd.c	Thu Apr 02 09:20:48 2009 +0000
@@ -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"
 
--- a/libmpcodecs/vf_boxblur.c	Thu Apr 02 08:42:16 2009 +0000
+++ b/libmpcodecs/vf_boxblur.c	Thu Apr 02 09:20:48 2009 +0000
@@ -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"
--- a/libmpcodecs/vf_delogo.c	Thu Apr 02 08:42:16 2009 +0000
+++ b/libmpcodecs/vf_delogo.c	Thu Apr 02 09:20:48 2009 +0000
@@ -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"
--- a/libmpcodecs/vf_denoise3d.c	Thu Apr 02 08:42:16 2009 +0000
+++ b/libmpcodecs/vf_denoise3d.c	Thu Apr 02 09:20:48 2009 +0000
@@ -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"
--- a/libmpcodecs/vf_fspp.c	Thu Apr 02 08:42:16 2009 +0000
+++ b/libmpcodecs/vf_fspp.c	Thu Apr 02 09:20:48 2009 +0000
@@ -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"
--- a/libmpcodecs/vf_hqdn3d.c	Thu Apr 02 08:42:16 2009 +0000
+++ b/libmpcodecs/vf_hqdn3d.c	Thu Apr 02 09:20:48 2009 +0000
@@ -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"
--- a/libmpcodecs/vf_il.c	Thu Apr 02 08:42:16 2009 +0000
+++ b/libmpcodecs/vf_il.c	Thu Apr 02 09:20:48 2009 +0000
@@ -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"
--- a/libmpcodecs/vf_kerndeint.c	Thu Apr 02 08:42:16 2009 +0000
+++ b/libmpcodecs/vf_kerndeint.c	Thu Apr 02 09:20:48 2009 +0000
@@ -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"
--- a/libmpcodecs/vf_mcdeint.c	Thu Apr 02 08:42:16 2009 +0000
+++ b/libmpcodecs/vf_mcdeint.c	Thu Apr 02 09:20:48 2009 +0000
@@ -51,8 +51,6 @@
 #include <inttypes.h>
 #include <math.h>
 
-#include "config.h"
-
 #include "mp_msg.h"
 #include "cpudetect.h"
 
@@ -65,10 +63,6 @@
 #undef free
 #undef malloc
 
-#if HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
--- a/libmpcodecs/vf_ow.c	Thu Apr 02 08:42:16 2009 +0000
+++ b/libmpcodecs/vf_ow.c	Thu Apr 02 09:20:48 2009 +0000
@@ -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"
--- a/libmpcodecs/vf_qp.c	Thu Apr 02 08:42:16 2009 +0000
+++ b/libmpcodecs/vf_qp.c	Thu Apr 02 09:20:48 2009 +0000
@@ -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];
--- a/libmpcodecs/vf_smartblur.c	Thu Apr 02 08:42:16 2009 +0000
+++ b/libmpcodecs/vf_smartblur.c	Thu Apr 02 09:20:48 2009 +0000
@@ -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"
--- a/libmpcodecs/vf_spp.c	Thu Apr 02 08:42:16 2009 +0000
+++ b/libmpcodecs/vf_spp.c	Thu Apr 02 09:20:48 2009 +0000
@@ -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"
--- a/libmpcodecs/vf_swapuv.c	Thu Apr 02 08:42:16 2009 +0000
+++ b/libmpcodecs/vf_swapuv.c	Thu Apr 02 09:20:48 2009 +0000
@@ -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"
--- a/libmpcodecs/vf_uspp.c	Thu Apr 02 08:42:16 2009 +0000
+++ b/libmpcodecs/vf_uspp.c	Thu Apr 02 09:20:48 2009 +0000
@@ -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"
--- a/libmpcodecs/vf_yadif.c	Thu Apr 02 08:42:16 2009 +0000
+++ b/libmpcodecs/vf_yadif.c	Thu Apr 02 09:20:48 2009 +0000
@@ -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"
--- a/libmpdemux/parse_mp4.c	Thu Apr 02 08:42:16 2009 +0000
+++ b/libmpdemux/parse_mp4.c	Thu Apr 02 09:20:48 2009 +0000
@@ -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"
--- a/libvo/vo_dxr3.c	Thu Apr 02 08:42:16 2009 +0000
+++ b/libvo/vo_dxr3.c	Thu Apr 02 09:20:48 2009 +0000
@@ -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"
--- a/loader/drv.c	Thu Apr 02 08:42:16 2009 +0000
+++ b/loader/drv.c	Thu Apr 02 09:20:48 2009 +0000
@@ -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>
--- a/loader/ext.c	Thu Apr 02 08:42:16 2009 +0000
+++ b/loader/ext.c	Thu Apr 02 09:20:48 2009 +0000
@@ -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>
--- a/loader/win32.c	Thu Apr 02 08:42:16 2009 +0000
+++ b/loader/win32.c	Thu Apr 02 09:20:48 2009 +0000
@@ -53,9 +53,6 @@
 #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>