diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-01-25 22:34:26 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-01-25 22:34:26 +0000 |
| commit | 4a0bcc13193e9a09d078bcfbf272fd80de92b76e (patch) | |
| tree | a4cb025af6a6aeda72daa7f36ff93c2397bf3e57 /libmpcodecs | |
| parent | cdcd4e75b7584dd34b622ee0e0283c78d6ab0005 (diff) | |
| download | mpv-4a0bcc13193e9a09d078bcfbf272fd80de92b76e.tar.bz2 mpv-4a0bcc13193e9a09d078bcfbf272fd80de92b76e.tar.xz | |
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
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vf_mcdeint.c | 5 | ||||
| -rw-r--r-- | libmpcodecs/vf_spp.c | 5 |
2 files changed, 10 insertions, 0 deletions
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 <malloc.h> #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 <malloc.h> #endif |