summaryrefslogtreecommitdiffstats
path: root/libmpcodecs/vf_pp.c
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-01-25 21:59:08 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-01-25 21:59:08 +0000
commit4ac4b493a9c88767fdeca5ac2c18578a0cf3e1f0 (patch)
tree572f51059b841ce257b9598563b9ca69818daf33 /libmpcodecs/vf_pp.c
parent401ea8e1db542e58b290fc0f5787f5247db34826 (diff)
downloadmpv-4ac4b493a9c88767fdeca5ac2c18578a0cf3e1f0.tar.bz2
mpv-4ac4b493a9c88767fdeca5ac2c18578a0cf3e1f0.tar.xz
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
Diffstat (limited to 'libmpcodecs/vf_pp.c')
-rw-r--r--libmpcodecs/vf_pp.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libmpcodecs/vf_pp.c b/libmpcodecs/vf_pp.c
index 2b4b6931b0..c538ee17f4 100644
--- a/libmpcodecs/vf_pp.c
+++ b/libmpcodecs/vf_pp.c
@@ -15,6 +15,7 @@
#include "img_format.h"
#include "mp_image.h"
#include "vf.h"
+#include "libavutil/internal.h"
#include "libpostproc/postprocess.h"
#ifdef CONFIG_LIBPOSTPROC_A
@@ -22,6 +23,8 @@
#include "libpostproc/postprocess_internal.h"
#endif
+#undef malloc
+
struct vf_priv_s {
int pp;
pp_mode_t *ppMode[PP_QUALITY_MAX+1];