diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-04-02 23:53:54 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-04-02 23:55:13 +0300 |
commit | d136cf68827382ad710adb74d02e50364052f430 (patch) | |
tree | df40e0284c9275bb185bc098cc3ed039bb765692 /libmpdemux/parse_mp4.c | |
parent | cf9edda1d370d39bc8a3d020a9c2bc4090d2457e (diff) | |
parent | 83c2df3565c19931b01c3ed75a0e08aca1fb24f2 (diff) | |
download | mpv-d136cf68827382ad710adb74d02e50364052f430.tar.bz2 mpv-d136cf68827382ad710adb74d02e50364052f430.tar.xz |
Merge svn changes up to r29134
Diffstat (limited to 'libmpdemux/parse_mp4.c')
-rw-r--r-- | libmpdemux/parse_mp4.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libmpdemux/parse_mp4.c b/libmpdemux/parse_mp4.c index 82b00a060c..c9f9ff2e80 100644 --- a/libmpdemux/parse_mp4.c +++ b/libmpdemux/parse_mp4.c @@ -23,9 +23,6 @@ #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" |