diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-01-25 21:59:08 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-01-25 21:59:08 +0000 |
commit | 4ac4b493a9c88767fdeca5ac2c18578a0cf3e1f0 (patch) | |
tree | 572f51059b841ce257b9598563b9ca69818daf33 /libmpcodecs/vf_fspp.c | |
parent | 401ea8e1db542e58b290fc0f5787f5247db34826 (diff) | |
download | mpv-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_fspp.c')
-rw-r--r-- | libmpcodecs/vf_fspp.c | 4 |
1 files changed, 4 insertions, 0 deletions
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 |