[MPlayer-cvslog] r29126 - in trunk: 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_denoise3...
diego
subversion at mplayerhq.hu
Thu Apr 2 11:20:48 CEST 2009
Author: diego
Date: Thu Apr 2 11:20:48 2009
New Revision: 29126
Log:
Remove unnecessary malloc.h #includes and related #ifdeffery.
Modified:
trunk/cpudetect.c
trunk/libaf/af.c
trunk/libmenu/vf_menu.c
trunk/libmpcodecs/dec_audio.c
trunk/libmpcodecs/dec_video.c
trunk/libmpcodecs/vd.c
trunk/libmpcodecs/vf_boxblur.c
trunk/libmpcodecs/vf_delogo.c
trunk/libmpcodecs/vf_denoise3d.c
trunk/libmpcodecs/vf_fspp.c
trunk/libmpcodecs/vf_hqdn3d.c
trunk/libmpcodecs/vf_il.c
trunk/libmpcodecs/vf_kerndeint.c
trunk/libmpcodecs/vf_mcdeint.c
trunk/libmpcodecs/vf_ow.c
trunk/libmpcodecs/vf_qp.c
trunk/libmpcodecs/vf_smartblur.c
trunk/libmpcodecs/vf_spp.c
trunk/libmpcodecs/vf_swapuv.c
trunk/libmpcodecs/vf_uspp.c
trunk/libmpcodecs/vf_yadif.c
trunk/libmpdemux/parse_mp4.c
trunk/libvo/vo_dxr3.c
trunk/loader/drv.c
trunk/loader/ext.c
trunk/loader/win32.c
Modified: trunk/cpudetect.c
==============================================================================
--- trunk/cpudetect.c Thu Apr 2 10:42:16 2009 (r29125)
+++ trunk/cpudetect.c Thu Apr 2 11:20:48 2009 (r29126)
@@ -4,9 +4,6 @@
CpuCaps gCpuCaps;
-#if HAVE_MALLOC_H
-#include <malloc.h>
-#endif
#include <stdlib.h>
#if ARCH_X86
Modified: trunk/libaf/af.c
==============================================================================
--- trunk/libaf/af.c Thu Apr 2 10:42:16 2009 (r29125)
+++ trunk/libaf/af.c Thu Apr 2 11:20:48 2009 (r29126)
@@ -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
Modified: trunk/libmenu/vf_menu.c
==============================================================================
--- trunk/libmenu/vf_menu.c Thu Apr 2 10:42:16 2009 (r29125)
+++ trunk/libmenu/vf_menu.c Thu Apr 2 11:20:48 2009 (r29126)
@@ -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"
Modified: trunk/libmpcodecs/dec_audio.c
==============================================================================
--- trunk/libmpcodecs/dec_audio.c Thu Apr 2 10:42:16 2009 (r29125)
+++ trunk/libmpcodecs/dec_audio.c Thu Apr 2 11:20:48 2009 (r29126)
@@ -19,10 +19,6 @@
#include "libaf/af.h"
-#if HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-
#ifdef CONFIG_DYNAMIC_PLUGINS
#include <dlfcn.h>
#endif
Modified: trunk/libmpcodecs/dec_video.c
==============================================================================
--- trunk/libmpcodecs/dec_video.c Thu Apr 2 10:42:16 2009 (r29125)
+++ trunk/libmpcodecs/dec_video.c Thu Apr 2 11:20:48 2009 (r29126)
@@ -2,9 +2,6 @@
#include "config.h"
#include <stdio.h>
-#if HAVE_MALLOC_H
-#include <malloc.h>
-#endif
#include <stdlib.h>
#include <unistd.h>
Modified: trunk/libmpcodecs/vd.c
==============================================================================
--- trunk/libmpcodecs/vd.c Thu Apr 2 10:42:16 2009 (r29125)
+++ trunk/libmpcodecs/vd.c Thu Apr 2 11:20:48 2009 (r29126)
@@ -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"
Modified: trunk/libmpcodecs/vf_boxblur.c
==============================================================================
--- trunk/libmpcodecs/vf_boxblur.c Thu Apr 2 10:42:16 2009 (r29125)
+++ trunk/libmpcodecs/vf_boxblur.c Thu Apr 2 11:20:48 2009 (r29126)
@@ -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"
Modified: trunk/libmpcodecs/vf_delogo.c
==============================================================================
--- trunk/libmpcodecs/vf_delogo.c Thu Apr 2 10:42:16 2009 (r29125)
+++ trunk/libmpcodecs/vf_delogo.c Thu Apr 2 11:20:48 2009 (r29126)
@@ -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"
Modified: trunk/libmpcodecs/vf_denoise3d.c
==============================================================================
--- trunk/libmpcodecs/vf_denoise3d.c Thu Apr 2 10:42:16 2009 (r29125)
+++ trunk/libmpcodecs/vf_denoise3d.c Thu Apr 2 11:20:48 2009 (r29126)
@@ -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"
Modified: trunk/libmpcodecs/vf_fspp.c
==============================================================================
--- trunk/libmpcodecs/vf_fspp.c Thu Apr 2 10:42:16 2009 (r29125)
+++ trunk/libmpcodecs/vf_fspp.c Thu Apr 2 11:20:48 2009 (r29126)
@@ -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"
Modified: trunk/libmpcodecs/vf_hqdn3d.c
==============================================================================
--- trunk/libmpcodecs/vf_hqdn3d.c Thu Apr 2 10:42:16 2009 (r29125)
+++ trunk/libmpcodecs/vf_hqdn3d.c Thu Apr 2 11:20:48 2009 (r29126)
@@ -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"
Modified: trunk/libmpcodecs/vf_il.c
==============================================================================
--- trunk/libmpcodecs/vf_il.c Thu Apr 2 10:42:16 2009 (r29125)
+++ trunk/libmpcodecs/vf_il.c Thu Apr 2 11:20:48 2009 (r29126)
@@ -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"
Modified: trunk/libmpcodecs/vf_kerndeint.c
==============================================================================
--- trunk/libmpcodecs/vf_kerndeint.c Thu Apr 2 10:42:16 2009 (r29125)
+++ trunk/libmpcodecs/vf_kerndeint.c Thu Apr 2 11:20:48 2009 (r29126)
@@ -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"
Modified: trunk/libmpcodecs/vf_mcdeint.c
==============================================================================
--- trunk/libmpcodecs/vf_mcdeint.c Thu Apr 2 10:42:16 2009 (r29125)
+++ trunk/libmpcodecs/vf_mcdeint.c Thu Apr 2 11:20:48 2009 (r29126)
@@ -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"
Modified: trunk/libmpcodecs/vf_ow.c
==============================================================================
--- trunk/libmpcodecs/vf_ow.c Thu Apr 2 10:42:16 2009 (r29125)
+++ trunk/libmpcodecs/vf_ow.c Thu Apr 2 11:20:48 2009 (r29126)
@@ -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"
Modified: trunk/libmpcodecs/vf_qp.c
==============================================================================
--- trunk/libmpcodecs/vf_qp.c Thu Apr 2 10:42:16 2009 (r29125)
+++ trunk/libmpcodecs/vf_qp.c Thu Apr 2 11:20:48 2009 (r29126)
@@ -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];
Modified: trunk/libmpcodecs/vf_smartblur.c
==============================================================================
--- trunk/libmpcodecs/vf_smartblur.c Thu Apr 2 10:42:16 2009 (r29125)
+++ trunk/libmpcodecs/vf_smartblur.c Thu Apr 2 11:20:48 2009 (r29126)
@@ -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"
Modified: trunk/libmpcodecs/vf_spp.c
==============================================================================
--- trunk/libmpcodecs/vf_spp.c Thu Apr 2 10:42:16 2009 (r29125)
+++ trunk/libmpcodecs/vf_spp.c Thu Apr 2 11:20:48 2009 (r29126)
@@ -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"
Modified: trunk/libmpcodecs/vf_swapuv.c
==============================================================================
--- trunk/libmpcodecs/vf_swapuv.c Thu Apr 2 10:42:16 2009 (r29125)
+++ trunk/libmpcodecs/vf_swapuv.c Thu Apr 2 11:20:48 2009 (r29126)
@@ -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"
Modified: trunk/libmpcodecs/vf_uspp.c
==============================================================================
--- trunk/libmpcodecs/vf_uspp.c Thu Apr 2 10:42:16 2009 (r29125)
+++ trunk/libmpcodecs/vf_uspp.c Thu Apr 2 11:20:48 2009 (r29126)
@@ -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"
Modified: trunk/libmpcodecs/vf_yadif.c
==============================================================================
--- trunk/libmpcodecs/vf_yadif.c Thu Apr 2 10:42:16 2009 (r29125)
+++ trunk/libmpcodecs/vf_yadif.c Thu Apr 2 11:20:48 2009 (r29126)
@@ -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"
Modified: trunk/libmpdemux/parse_mp4.c
==============================================================================
--- trunk/libmpdemux/parse_mp4.c Thu Apr 2 10:42:16 2009 (r29125)
+++ trunk/libmpdemux/parse_mp4.c Thu Apr 2 11:20:48 2009 (r29126)
@@ -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"
Modified: trunk/libvo/vo_dxr3.c
==============================================================================
--- trunk/libvo/vo_dxr3.c Thu Apr 2 10:42:16 2009 (r29125)
+++ trunk/libvo/vo_dxr3.c Thu Apr 2 11:20:48 2009 (r29126)
@@ -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"
Modified: trunk/loader/drv.c
==============================================================================
--- trunk/loader/drv.c Thu Apr 2 10:42:16 2009 (r29125)
+++ trunk/loader/drv.c Thu Apr 2 11:20:48 2009 (r29126)
@@ -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>
Modified: trunk/loader/ext.c
==============================================================================
--- trunk/loader/ext.c Thu Apr 2 10:42:16 2009 (r29125)
+++ trunk/loader/ext.c Thu Apr 2 11:20:48 2009 (r29126)
@@ -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>
Modified: trunk/loader/win32.c
==============================================================================
--- trunk/loader/win32.c Thu Apr 2 10:42:16 2009 (r29125)
+++ trunk/loader/win32.c Thu Apr 2 11:20:48 2009 (r29126)
@@ -53,9 +53,6 @@ for DLL to know too much about its envir
#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>
More information about the MPlayer-cvslog
mailing list