Mercurial > mplayer.hg

diff libmpcodecs/vf_fspp.c @ 28327:c39a1fd7d45c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix compilation after DECLARE_ASM_CONST/DECLARE_ALIGNED moving within FFmpeg.
author diego
date Sun, 25 Jan 2009 21:59:08 +0000
parents 25337a2147e7
children 7f03a6d3c941
line wrap: on
line diff
--- a/libmpcodecs/vf_fspp.c	Sun Jan 25 21:03:02 2009 +0000
+++ b/libmpcodecs/vf_fspp.c	Sun Jan 25 21:59:08 2009 +0000
@@ -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