# HG changeset patch # User diego # Date 1232922866 0 # Node ID ed42e982e79f832e84906a12d17b847c0ac574eb # Parent 50c9bf3e41cfc86532593f4040e21e7b9009188e Fix compilation after DECLARE_ASM_CONST/DECLARE_ALIGNED moving within FFmpeg. diff -r 50c9bf3e41cf -r ed42e982e79f libmpcodecs/vf_mcdeint.c --- a/libmpcodecs/vf_mcdeint.c Sun Jan 25 22:12:42 2009 +0000 +++ b/libmpcodecs/vf_mcdeint.c Sun Jan 25 22:34:26 2009 +0000 @@ -56,10 +56,15 @@ #include "mp_msg.h" #include "cpudetect.h" +#include "libavutil/internal.h" #include "libavutil/intreadwrite.h" #include "libavcodec/avcodec.h" #include "libavcodec/dsputil.h" +#undef fprintf +#undef free +#undef malloc + #ifdef HAVE_MALLOC_H #include #endif diff -r 50c9bf3e41cf -r ed42e982e79f libmpcodecs/vf_spp.c --- a/libmpcodecs/vf_spp.c Sun Jan 25 22:12:42 2009 +0000 +++ b/libmpcodecs/vf_spp.c Sun Jan 25 22:34:26 2009 +0000 @@ -37,10 +37,15 @@ #include "mp_msg.h" #include "cpudetect.h" +#include "libavutil/internal.h" #include "libavutil/intreadwrite.h" #include "libavcodec/avcodec.h" #include "libavcodec/dsputil.h" +#undef fprintf +#undef free +#undef malloc + #ifdef HAVE_MALLOC_H #include #endif