summaryrefslogtreecommitdiffstats
path: root/libmenu
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 /libmenu
parentcf9edda1d370d39bc8a3d020a9c2bc4090d2457e (diff)
parent83c2df3565c19931b01c3ed75a0e08aca1fb24f2 (diff)
downloadmpv-d136cf68827382ad710adb74d02e50364052f430.tar.bz2
mpv-d136cf68827382ad710adb74d02e50364052f430.tar.xz
Merge svn changes up to r29134
Diffstat (limited to 'libmenu')
-rw-r--r--libmenu/vf_menu.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/libmenu/vf_menu.c b/libmenu/vf_menu.c
index 5112586e48..6ce0c37fd8 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"