summaryrefslogtreecommitdiffstats
path: root/libvo/vo_dxr3.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-04-02 23:53:54 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-04-02 23:55:13 +0300
commitd136cf68827382ad710adb74d02e50364052f430 (patch)
treedf40e0284c9275bb185bc098cc3ed039bb765692 /libvo/vo_dxr3.c
parentcf9edda1d370d39bc8a3d020a9c2bc4090d2457e (diff)
parent83c2df3565c19931b01c3ed75a0e08aca1fb24f2 (diff)
downloadmpv-d136cf68827382ad710adb74d02e50364052f430.tar.bz2
mpv-d136cf68827382ad710adb74d02e50364052f430.tar.xz
Merge svn changes up to r29134
Diffstat (limited to 'libvo/vo_dxr3.c')
-rw-r--r--libvo/vo_dxr3.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/libvo/vo_dxr3.c b/libvo/vo_dxr3.c
index e9474a0eb2..9893e80fb0 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"