From 4a0bcc13193e9a09d078bcfbf272fd80de92b76e Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 25 Jan 2009 22:34:26 +0000 Subject: [PATCH] Fix compilation after DECLARE_ASM_CONST/DECLARE_ALIGNED moving within FFmpeg. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28364 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/vf_mcdeint.c | 5 +++++ libmpcodecs/vf_spp.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/libmpcodecs/vf_mcdeint.c b/libmpcodecs/vf_mcdeint.c index 7e89c33e08..81b70f58d7 100644 --- a/libmpcodecs/vf_mcdeint.c +++ b/libmpcodecs/vf_mcdeint.c @@ -56,10 +56,15 @@ Known Issues: #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 --git a/libmpcodecs/vf_spp.c b/libmpcodecs/vf_spp.c index 24ace868e2..f1071bf5d6 100644 --- a/libmpcodecs/vf_spp.c +++ b/libmpcodecs/vf_spp.c @@ -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