From 4ac4b493a9c88767fdeca5ac2c18578a0cf3e1f0 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 25 Jan 2009 21:59:08 +0000
Subject: Fix compilation after DECLARE_ASM_CONST/DECLARE_ALIGNED moving within
 FFmpeg.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28362 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libmpcodecs/vf_fspp.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'libmpcodecs/vf_fspp.c')

diff --git a/libmpcodecs/vf_fspp.c b/libmpcodecs/vf_fspp.c
index a5e360306f..cf3aac3768 100644
--- a/libmpcodecs/vf_fspp.c
+++ b/libmpcodecs/vf_fspp.c
@@ -43,6 +43,7 @@
 #include "mp_msg.h"
 #include "cpudetect.h"
 
+#include "libavutil/internal.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/mem.h"
 #include "libavcodec/avcodec.h"
@@ -57,6 +58,9 @@
 #include "vf.h"
 #include "libvo/fastmemcpy.h"
 
+#undef free
+#undef malloc
+
 //===========================================================================//
 #define BLOCKSZ 12
 
-- 
cgit v1.2.3