diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:52:17 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:52:17 +0200 |
| commit | 5099b1458d6a5e57b4ebd7c6dfc07dbbd405a652 (patch) | |
| tree | 705780fb6af4cdc0836a10a409fbd51495ec1142 /libmpcodecs/vd_dmo.c | |
| parent | 5eeba24ab73e4ae64d7212a9ceef3fb8801fe8a8 (diff) | |
| parent | 160b880c4fd10cec41ba2c14c846d0a7e7f21048 (diff) | |
| download | mpv-5099b1458d6a5e57b4ebd7c6dfc07dbbd405a652.tar.bz2 mpv-5099b1458d6a5e57b4ebd7c6dfc07dbbd405a652.tar.xz | |
Merge svn changes up to r30683
Diffstat (limited to 'libmpcodecs/vd_dmo.c')
| -rw-r--r-- | libmpcodecs/vd_dmo.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libmpcodecs/vd_dmo.c b/libmpcodecs/vd_dmo.c index 42630d7c7e..125357fc8e 100644 --- a/libmpcodecs/vd_dmo.c +++ b/libmpcodecs/vd_dmo.c @@ -16,12 +16,15 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" + +#if HAVE_MALLOC_H +#include <malloc.h> +#endif #include <stdio.h> #include <stdlib.h> #include <stdarg.h> -#include "config.h" - #include "mp_msg.h" #include "help_mp.h" |